about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rwxr-xr-xrebuild_wrappers.py828
-rw-r--r--src/wrapped/generated/functions_list.txt59
-rw-r--r--src/wrapped/generated/wrappedaluredefs.h8
-rw-r--r--src/wrapped/generated/wrappedaluretypes.h17
-rw-r--r--src/wrapped/generated/wrappedalureundefs.h8
-rw-r--r--src/wrapped/generated/wrappedalutdefs.h8
-rw-r--r--src/wrapped/generated/wrappedaluttypes.h17
-rw-r--r--src/wrapped/generated/wrappedalutundefs.h8
-rw-r--r--src/wrapped/generated/wrappedatkbridgedefs.h8
-rw-r--r--src/wrapped/generated/wrappedatkbridgetypes.h17
-rw-r--r--src/wrapped/generated/wrappedatkbridgeundefs.h8
-rw-r--r--src/wrapped/generated/wrappedatkdefs.h8
-rw-r--r--src/wrapped/generated/wrappedatktypes.h17
-rw-r--r--src/wrapped/generated/wrappedatkundefs.h8
-rw-r--r--src/wrapped/generated/wrappedatspidefs.h8
-rw-r--r--src/wrapped/generated/wrappedatspitypes.h17
-rw-r--r--src/wrapped/generated/wrappedatspiundefs.h8
-rw-r--r--src/wrapped/generated/wrappedbz2defs.h8
-rw-r--r--src/wrapped/generated/wrappedbz2undefs.h8
-rw-r--r--src/wrapped/generated/wrappedcairodefs.h8
-rw-r--r--src/wrapped/generated/wrappedcairotypes.h17
-rw-r--r--src/wrapped/generated/wrappedcairoundefs.h8
-rw-r--r--src/wrapped/generated/wrappedcrashhandlerdefs.h8
-rw-r--r--src/wrapped/generated/wrappedcrashhandlertypes.h17
-rw-r--r--src/wrapped/generated/wrappedcrashhandlerundefs.h8
-rw-r--r--src/wrapped/generated/wrappedcryptodefs.h8
-rw-r--r--src/wrapped/generated/wrappedcryptoundefs.h8
-rw-r--r--src/wrapped/generated/wrappedcurldefs.h8
-rw-r--r--src/wrapped/generated/wrappedcurlundefs.h8
-rw-r--r--src/wrapped/generated/wrappeddbusdefs.h8
-rw-r--r--src/wrapped/generated/wrappeddbusundefs.h8
-rw-r--r--src/wrapped/generated/wrappedexpatdefs.h8
-rw-r--r--src/wrapped/generated/wrappedexpatundefs.h8
-rw-r--r--src/wrapped/generated/wrappedflacdefs.h8
-rw-r--r--src/wrapped/generated/wrappedflacundefs.h8
-rw-r--r--src/wrapped/generated/wrappedfontconfigdefs.h8
-rw-r--r--src/wrapped/generated/wrappedfontconfigtypes.h17
-rw-r--r--src/wrapped/generated/wrappedfontconfigundefs.h8
-rw-r--r--src/wrapped/generated/wrappedfreetypedefs.h8
-rw-r--r--src/wrapped/generated/wrappedfreetypeundefs.h8
-rw-r--r--src/wrapped/generated/wrappedgnutlsdefs.h8
-rw-r--r--src/wrapped/generated/wrappedgnutlsundefs.h8
-rw-r--r--src/wrapped/generated/wrappedgssapikrb5defs.h8
-rw-r--r--src/wrapped/generated/wrappedgssapikrb5types.h17
-rw-r--r--src/wrapped/generated/wrappedgssapikrb5undefs.h8
-rw-r--r--src/wrapped/generated/wrappedkrb5defs.h8
-rw-r--r--src/wrapped/generated/wrappedkrb5undefs.h8
-rw-r--r--src/wrapped/generated/wrappedldlinuxdefs.h8
-rw-r--r--src/wrapped/generated/wrappedldlinuxundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibasounddefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibasoundundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibcdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibcryptdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibcrypttypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibcryptundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibcundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibcupsdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibcupstypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibcupsundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibdldefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibdlundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibformdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibformtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibformundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibformwdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibformwtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibformwundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibgldefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibgludefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibglundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibgluundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibicedefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibicetypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibiceundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibmdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibmundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibncurses6defs.h8
-rw-r--r--src/wrapped/generated/wrappedlibncurses6undefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibncursesdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibncursesundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibncurseswdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibncurseswundefs.h8
-rw-r--r--src/wrapped/generated/wrappedliboggdefs.h8
-rw-r--r--src/wrapped/generated/wrappedliboggtypes.h17
-rw-r--r--src/wrapped/generated/wrappedliboggundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibpaneldefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibpaneltypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibpanelundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibpcredefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibpcretypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibpcreundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibpthreaddefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibpthreadundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibresolvdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibresolvtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibresolvundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibrtdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibrtundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibsmdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibsmundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibssldefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibsslundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibtinfo6defs.h8
-rw-r--r--src/wrapped/generated/wrappedlibtinfo6undefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibtinfodefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibtinfoundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibuuiddefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibuuidtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibuuidundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibvorbisdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibvorbistypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibvorbisundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibx11defs.h8
-rw-r--r--src/wrapped/generated/wrappedlibx11undefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibx11xcbdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibx11xcbtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibx11xcbundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxaudefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxautypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxauundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbglxdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbglxtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxcbglxundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbimagedefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbimagetypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxcbimageundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbkeysymsdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbkeysymstypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxcbkeysymsundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbrandrdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbrandrtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxcbrandrundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbshapedefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbshapetypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxcbshapeundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbshmdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbshmtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxcbshmundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxcbundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbxfixesdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbxfixestypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxcbxfixesundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbxtestdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcbxtesttypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxcbxtestundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcompositedefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcompositetypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxcompositeundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcursordefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxcursortypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxcursorundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxdamagedefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxdamagetypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxdamageundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxdmcpdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxdmcptypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxdmcpundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxextdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxextundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxfixesdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxfixestypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxfixesundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxftdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxfttypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxftundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxidefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxitypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxiundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxmudefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxmutypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxmuundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxpmdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxpmtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxpmundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxrandrdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxrandrtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxrandrundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxrenderdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxrendertypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxrenderundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxssdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxsstypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxssundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxtdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxtstdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxtstundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxtundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxxf86vmdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibxxf86vmtypes.h17
-rw-r--r--src/wrapped/generated/wrappedlibxxf86vmundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibzdefs.h8
-rw-r--r--src/wrapped/generated/wrappedlibzundefs.h8
-rw-r--r--src/wrapped/generated/wrappedlzmadefs.h8
-rw-r--r--src/wrapped/generated/wrappedlzmaundefs.h8
-rw-r--r--src/wrapped/generated/wrappedmpg123defs.h8
-rw-r--r--src/wrapped/generated/wrappedmpg123undefs.h8
-rw-r--r--src/wrapped/generated/wrappedopenaldefs.h8
-rw-r--r--src/wrapped/generated/wrappedopenalundefs.h8
-rw-r--r--src/wrapped/generated/wrappedpangocairodefs.h8
-rw-r--r--src/wrapped/generated/wrappedpangocairotypes.h17
-rw-r--r--src/wrapped/generated/wrappedpangocairoundefs.h8
-rw-r--r--src/wrapped/generated/wrappedpangodefs.h8
-rw-r--r--src/wrapped/generated/wrappedpangoft2defs.h8
-rw-r--r--src/wrapped/generated/wrappedpangoft2types.h17
-rw-r--r--src/wrapped/generated/wrappedpangoft2undefs.h8
-rw-r--r--src/wrapped/generated/wrappedpangoundefs.h8
-rw-r--r--src/wrapped/generated/wrappedpng16defs.h8
-rw-r--r--src/wrapped/generated/wrappedpng16undefs.h8
-rw-r--r--src/wrapped/generated/wrappedpulsedefs.h8
-rw-r--r--src/wrapped/generated/wrappedpulsesimpledefs.h8
-rw-r--r--src/wrapped/generated/wrappedpulsesimpletypes.h17
-rw-r--r--src/wrapped/generated/wrappedpulsesimpleundefs.h8
-rw-r--r--src/wrapped/generated/wrappedpulseundefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1defs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1imagedefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1imageundefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1mixerdefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1mixerundefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1netdefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1nettypes.h17
-rw-r--r--src/wrapped/generated/wrappedsdl1netundefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1sounddefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1soundundefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1ttfdefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1ttfundefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl1undefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl2defs.h9
-rw-r--r--src/wrapped/generated/wrappedsdl2imagedefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl2imageundefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl2mixerdefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl2mixerundefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl2netdefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl2nettypes.h17
-rw-r--r--src/wrapped/generated/wrappedsdl2netundefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl2ttfdefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl2ttfundefs.h8
-rw-r--r--src/wrapped/generated/wrappedsdl2types.h6
-rw-r--r--src/wrapped/generated/wrappedsdl2undefs.h9
-rw-r--r--src/wrapped/generated/wrappedsmpeg2defs.h8
-rw-r--r--src/wrapped/generated/wrappedsmpeg2undefs.h8
-rw-r--r--src/wrapped/generated/wrappedsmpegdefs.h8
-rw-r--r--src/wrapped/generated/wrappedsmpegundefs.h8
-rw-r--r--src/wrapped/generated/wrappedtcmallocminimaldefs.h8
-rw-r--r--src/wrapped/generated/wrappedtcmallocminimalundefs.h8
-rw-r--r--src/wrapped/generated/wrappedudev0defs.h8
-rw-r--r--src/wrapped/generated/wrappedudev0undefs.h8
-rw-r--r--src/wrapped/generated/wrappedudev1defs.h8
-rw-r--r--src/wrapped/generated/wrappedudev1undefs.h8
-rw-r--r--src/wrapped/generated/wrappedutildefs.h8
-rw-r--r--src/wrapped/generated/wrappedutilundefs.h8
-rw-r--r--src/wrapped/generated/wrappedvorbisfiledefs.h8
-rw-r--r--src/wrapped/generated/wrappedvorbisfileundefs.h8
-rw-r--r--src/wrapped/generated/wrappedxineramadefs.h8
-rw-r--r--src/wrapped/generated/wrappedxineramatypes.h17
-rw-r--r--src/wrapped/generated/wrappedxineramaundefs.h8
-rw-r--r--src/wrapped/generated/wrappedxkbcommondefs.h8
-rw-r--r--src/wrapped/generated/wrappedxkbcommontypes.h17
-rw-r--r--src/wrapped/generated/wrappedxkbcommonundefs.h8
-rw-r--r--src/wrapped/generated/wrappedxkbcommonx11defs.h8
-rw-r--r--src/wrapped/generated/wrappedxkbcommonx11types.h17
-rw-r--r--src/wrapped/generated/wrappedxkbcommonx11undefs.h8
-rw-r--r--src/wrapped/generated/wrappedxml2defs.h8
-rw-r--r--src/wrapped/generated/wrappedxml2undefs.h8
-rw-r--r--src/wrapped/generated/wrapper.c3
-rw-r--r--src/wrapped/generated/wrapper.h3
-rwxr-xr-xsrc/wrapped/wrappedlib_init.h8
-rwxr-xr-xsrc/wrapped/wrappedsdl2.c20
-rwxr-xr-xsrc/wrapped/wrappedsdl2_private.h4
270 files changed, 3197 insertions, 300 deletions
diff --git a/rebuild_wrappers.py b/rebuild_wrappers.py
index 65f0f786..2f1e8dcf 100755
--- a/rebuild_wrappers.py
+++ b/rebuild_wrappers.py
@@ -1,33 +1,152 @@
 #!/usr/bin/env python3
 
-# TODO: same as for box86, flac can't be auto-generated yet
+import os
+import sys
 
 try:
-	# Python 3.5.2+ (NewType)
-	from typing import Union, List, Sequence, Dict, Tuple, NewType, TypeVar
+	assert(sys.version_info.major == 3)
+	if sys.version_info.minor >= 9:
+		# Python 3.9+
+		from typing import Generic, NewType, Optional, TypeVar, Union, final
+		from collections.abc import Iterable, Mapping
+		Dict = dict
+		List = list
+		Tuple = tuple
+	elif sys.version_info.minor >= 8:
+		# Python [3.8, 3.9)
+		from typing import Dict, List, Tuple, Generic, Iterable, Mapping, NewType, Optional, TypeVar, Union, final
+	elif (sys.version_info.minor >= 5) and (sys.version_info.micro >= 2):
+		# Python [3.5.2, 3.8)
+		from typing import Dict, List, Tuple, Generic, Iterable, Mapping, NewType, Optional, TypeVar, Union
+		final = lambda fun: fun # type: ignore
+	elif sys.version_info.minor >= 5:
+		# Python [3.5, 3.5.2)
+		from typing import Dict, List, Tuple, Generic, Iterable, Mapping, Optional, TypeVar, Union
+		class GTDummy:
+			def __getitem__(self, _): return self
+		final = lambda fun: fun # type: ignore
+		def NewType(_, b): return b # type: ignore
+	else:
+		# Python < 3.5
+		#print("Your Python version does not have the typing module, fallback to empty 'types'")
+		# Dummies
+		class GTDummy:
+			def __getitem__(self, _):
+				return self
+		Dict = GTDummy() # type: ignore
+		List = GTDummy() # type: ignore
+		Generic = GTDummy() # type: ignore
+		Iterable = GTDummy() # type: ignore
+		Mapping = GTDummy() # type: ignore
+		Optional = GTDummy() # type: ignore
+		def NewType(_, b): return b # type: ignore
+		Tuple = GTDummy() # type: ignore
+		def TypeVar(T): return object # type: ignore
+		Union = GTDummy() # type: ignore
 except ImportError:
-	#print("Your Python version does not have the typing module, fallback to empty 'types'")
-	# Dummies
-	class GTDummy:
-		def __getitem__(self, t):
-			return self
-	Union = GTDummy() # type: ignore
-	List = GTDummy() # type: ignore
-	Sequence = GTDummy() # type: ignore
-	Dict = GTDummy() # type: ignore
-	Tuple = GTDummy() # type: ignore
-	def NewType(T, b): return b # type: ignore
-	def TypeVar(T): return object # type: ignore
-try:
-	# Python 3.8+
-	from typing import final
-except ImportError:
-	#print("Your Python version does not have all typing utilities, fallback to dummy ones")
-	final = lambda fun: fun # type: ignore
+	print("It seems your Python version is quite broken...")
+	assert(False)
 
-import os
-import sys
+"""
+Generates all files in src/wrapped/generated
+===
+
+TL;DR: Automagically creates type definitions (/.F.+/ functions/typedefs...).
+       All '//%' in the headers are used by the script.
+
+Reads each lines of each "_private.h" headers.
+For each of them:
+- If if starts with a #ifdef, #else, #ifndef, #endif, it memorizes which definition is required
+- If it starts with a "GO", it will do multiple things:
+  - It memorizes the type used by the function (second macro argument)
+  - It memorizes the type it is mapped to, if needed (eg, iFEvp is mapped to iFEp: the first "real" argument is dropped)
+  - It checks if the type given (both original and mapped to) are valid
+  - If the signature contains a 'E' but it is not a "GOM" command, it will throw an error
+- If the line starts with a '//%S', it will memorize a structure declaration.
+  The structure of it is: "//%S <letter> <structure name> <signature equivalent>"
+  NOTE: Those structure letters are "fake types" that are accepted in the macros.
+
+After sorting the data, it generates:
+
+wrapper.c
+---------
+(Private) type definitions (/.F.+_t/)
+Function definitions (/.F.+/ functions, that actually execute the function given as argument)
+isSimpleWrapper definition
+
+wrapper.h
+---------
+Generic "wrapper_t" type definition
+Function declarations (/.F.+/ functions)
+
+*types.h
+--------
+Local types definition, for the original signatures
+The SUPER() macro definition, used to generate and initialize the `*_my_t` library structure
+(TODO: also automate this declaration/definition? It would require more metadata,
+ and may break sometime in the future due to the system changing...)
+
+*defs.h
+-------
+Local `#define`s, for signature mapping
+
+*undefs.h
+---------
+Local `#undefine`s, for signature mapping
+
+
+Example:
+========
+In wrappedtest_private.h:
+   ----------------------
+//%S X TestLibStructure ppu
+
+GO(superfunction, pFX)
+GOM(superFunction2, pFpX)
 
+Generated files:
+wrapper.c: [snippet]
+----------
+typedef void *(*pFppu_t)(void*, void*, uint32_t);
+typedef void *(*pFpppu_t)(void*, void*, void*, uint32_t);
+
+void pFppu(x64emu_t *emu, uintptr_t fcn) { pFppu_t *fn = (pFppu_t)fn; R_RAX=...; }
+void pFpppu(x64emu_t *emu, uintptr_t fcn) { pFpppu_t *fn = (pFpppu_t)fn; R_RAX=...; }
+
+int isSimpleWrapper(wrapper_t fun) {
+	if (fcn == pFppu) return 1;
+	if (fcn == pFpppu) return 1;
+	return 0;
+}
+
+wrapper.h: [snippet]
+----------
+void pFppu(x64emu_t *emu, uintptr_t fcn);
+void pFpppu(x64emu_t *emu, uintptr_t fcn);
+
+int isSimpleWrapper(wrapper_t fun);
+
+wrappedtesttypes.h:
+-------------------
+typedef void *(*pFpX_t)(void*, TestLibStructure);
+
+#define SUPER() \\
+	GO(superFunction2, pFpX)
+
+wrappedtestdefs.h:
+------------------
+#define pFX pFppu
+#define pFpX pFpppu
+
+wrappedtestundefs.h:
+--------------------
+#undef pFX
+#undef pFpX
+"""
+
+# TODO: Add /.F.*A/ automatic generation (and suppression)
+
+# Free letters:  B   FG  J      QR T   XYZab  e gh jk mno qrst   xyz
 class FunctionType(str):
 	values: List[str] = ['E', 'v', 'c', 'w', 'i', 'I', 'C', 'W', 'u', 'U', 'f', 'd', 'D', 'K', 'l', 'L', 'p', 'V', 'O', 'S', 'N', 'M', 'H', 'P', 'A']
 	
@@ -74,9 +193,23 @@ assert(all(c not in FunctionType.values[:i] for i, c in enumerate(FunctionType.v
 RedirectType = NewType('RedirectType', FunctionType)
 DefineType = NewType('DefineType', str)
 
+StructType = NewType('StructType', str)
+
 T = TypeVar('T')
 U = TypeVar('U')
 
+# TODO: simplify construction of this (add an 'insert' method?...)
+class CustOrderedDict(Generic[T, U], Iterable[T]):
+	def __init__(self, dict: Dict[T, U], keys: List[T]):
+		self.__indict__ = dict
+		self.__inkeys__ = keys
+	
+	def __iter__(self):
+		return iter(self.__inkeys__)
+	
+	def __getitem__(self, k: T) -> U:
+		return self.__indict__[k]
+
 Filename = str
 ClausesStr = str
 
@@ -184,7 +317,6 @@ class Clauses:
 		for cunj in self.definess:
 			for d in cunj.defines:
 				ret.append(d.value())
-		ret.append(0)
 		return ret
 	
 	def __str__(self) -> ClausesStr:
@@ -193,22 +325,30 @@ class Clauses:
 		else:
 			return "(" + ") || (".join(map(str, self.definess)) + ")"
 
-def readFiles(files: Sequence[Filename]) -> \
-		Tuple[Dict[ClausesStr, List[FunctionType]],
-		      Dict[ClausesStr, Dict[RedirectType, FunctionType]],
-		      Dict[Filename,   Dict[RedirectType, List[str]]]]:
+JumbledGlobals       = Dict[ClausesStr, List[FunctionType]]
+JumbledRedirects     = Dict[ClausesStr, Dict[RedirectType, FunctionType]]
+JumbledTypedefs      = Dict[RedirectType, List[str]]
+JumbledStructures    = Dict[str, Tuple[StructType, str]]
+JumbledStructUses    = Dict[RedirectType, FunctionType]
+JumbledFilesSpecific = Dict[Filename, Tuple[JumbledTypedefs, JumbledStructures, JumbledStructUses]]
+SortedGlobals       = CustOrderedDict[ClausesStr, List[FunctionType]]
+SortedRedirects     = CustOrderedDict[ClausesStr, List[Tuple[RedirectType, FunctionType]]]
+SortedTypedefs      = CustOrderedDict[RedirectType, List[str]]
+SortedStructUses    = CustOrderedDict[RedirectType, FunctionType]
+SortedFilesSpecific = Dict[Filename, Tuple[SortedTypedefs, SortedStructUses]]
+
+def readFiles(files: Iterable[Filename]) -> Tuple[JumbledGlobals, JumbledRedirects, JumbledFilesSpecific]:
 	"""
 	readFiles
 	
 	This function is the one that parses the files.
-	It returns the jumbled (gbl, redirects, mytypedefs) tuple.
+	It returns the jumbled (gbl, redirects, {file: (typedefs, mystructs)}) tuple.
 	"""
 	
 	# Initialize variables: gbl for all values, redirects for redirections
-	# mytypedefs is a list of all "*FE*" types per filename
-	gbl       : Dict[ClausesStr, List[FunctionType]]               = {}
-	redirects : Dict[ClausesStr, Dict[RedirectType, FunctionType]] = {}
-	mytypedefs: Dict[Filename,   Dict[RedirectType, List[str]]]    = {}
+	gbl      : JumbledGlobals       = {}
+	redirects: JumbledRedirects     = {}
+	filespec : JumbledFilesSpecific = {}
 	
 	functions: Dict[str, Filename] = {}
 	halt_required = False # Is there a GO(*, .FE*) or similar in-batch error(s)?
@@ -217,16 +357,23 @@ def readFiles(files: Sequence[Filename]) -> \
 		filename: Filename = filepath.split("/")[-1]
 		dependants: Clause = Clause()
 		
-		def add_function_name(funname: Union[str, None], funsname: Dict[ClausesStr, List[str]] = {"": []}):
+		# typedefs is a list of all "*FE*" types for the current file
+		# mystructs  is a map  of all char -> (structure C name, replacement) for structures
+		typedefs  : JumbledTypedefs   = {}
+		mystructs   : JumbledStructures = {}
+		mystructuses: JumbledStructUses = {}
+		filespec[filename[:-10]] = (typedefs, mystructs, mystructuses)
+		
+		def add_symbol_name(funname: Union[str, None], funsname: Dict[ClausesStr, List[str]] = {"": []}):
 			# Optional arguments are evaluated only once!
 			nonlocal halt_required
-			if funname == None:
+			if funname is None:
 				for k in funsname:
 					if (k != "") and (len(funsname[k]) != 0):
 						# Note: if this condition ever raises, check the wrapper pointed by it.
 						# If you find no problem, comment the error below, add a "pass" line (so python is happy)
 						# and open a ticket so I can fix this.
-						raise NotImplementedError("Some functions are only implemented under one condition (probably) ({0}/{1})"
+						raise NotImplementedError("Some functions are only implemented under one condition (probably) ({0}:{1})"
 							.format(k, filename) + " [extra note in the script]")
 					for f in funsname[k]:
 						if f in ['_fini', '_init', '__bss_start', '__data_start', '_edata', '_end']:
@@ -276,6 +423,7 @@ def readFiles(files: Sequence[Filename]) -> \
 					funsname[""].append(funname)
 		
 		with open(filepath, 'r') as file:
+			line: str # Because VSCode really struggles with files
 			for line in file:
 				ln = line.strip()
 				# If the line is a `#' line (#ifdef LD80BITS/#ifndef LD80BITS/header)
@@ -304,6 +452,7 @@ def readFiles(files: Sequence[Filename]) -> \
 						raise NotImplementedError("Unknown key: {0} ({1}:{2})".format(
 							k.args[0], filename, line[:-1]
 						)) from k
+				
 				# If the line is a `GO...' line (GO/GOM/GO2/...)...
 				elif ln.startswith("GO"):
 					# ... then look at the second parameter of the line
@@ -311,62 +460,104 @@ def readFiles(files: Sequence[Filename]) -> \
 						gotype = ln.split("(")[0].strip()
 						funname = ln.split(",")[0].split("(")[1].strip()
 						ln = ln.split(",")[1].split(")")[0].strip()
-						add_function_name(funname)
+						add_symbol_name(funname)
 					except IndexError:
 						raise NotImplementedError("Invalid GO command: {0}:{1}".format(
 							filename, line[:-1]
 						))
 					
+					hasFlatStructure = False
+					origLine = ln
 					if not FunctionType.validate(ln, " ({0}:{1})".format(filename, line[:-1])):
-						old = RedirectType(FunctionType(ln))
-						# This needs more work
-						acceptables = ['v', '0', '1'] + FunctionType.values
-						if any(c not in acceptables for c in ln[2:]):
-							raise NotImplementedError("{0} ({1}:{2})".format(ln[2:], filename, line[:-1]))
-						# Ok, this is acceptable: there is 0, 1 and/or void
-						ln = ln[:2] + (ln[2:]
-							.replace("v", "")   # void   -> nothing
-							.replace("0", "i")  # 0      -> integer
-							.replace("1", "i")) # 1      -> integer
-						assert(len(ln) >= 3)
-						redirects.setdefault(str(dependants), {})
-						redirects[str(dependants)][old] = FunctionType(ln)
+						if (ln[0] in FunctionType.values) \
+						 and ('v' not in ln[2:]) \
+						 and all((c in FunctionType.values) or (c in mystructs) for c in ln[2:]):
+							hasFlatStructure = True
+							
+							for sn in mystructs:
+								ln = ln.replace(sn, mystructs[sn][1])
+							mystructuses[RedirectType(FunctionType(origLine))] = FunctionType(ln)
+						else:
+							# This needs more work
+							old = RedirectType(FunctionType(ln))
+							acceptables = ['0', '1'] + FunctionType.values
+							if any(c not in acceptables for c in ln[2:]):
+								raise NotImplementedError("{0} ({1}:{2})".format(ln[2:], filename, line[:-1]))
+							# Ok, this is acceptable: there is 0, 1 and/or void
+							ln = ln[:2] + (ln[2:]
+								.replace("v", "")   # void   -> nothing
+								.replace("0", "i")  # 0      -> integer
+								.replace("1", "i")) # 1      -> integer
+							assert(len(ln) >= 3)
+							redirects.setdefault(str(dependants), {})
+							redirects[str(dependants)][old] = FunctionType(ln)
+							
+							origLine = ln
+					
 					# Simply append the function type if it's not yet existing
 					gbl.setdefault(str(dependants), [])
 					if ln not in gbl[str(dependants)]:
 						gbl[str(dependants)].append(FunctionType(ln))
 					
-					if ln[2] == "E":
+					if origLine[2] == "E":
 						if (gotype != "GOM") and (gotype != "GOWM"):
 							if (gotype != "GO2") or not (line.split(',')[2].split(')')[0].strip().startswith('my_')):
 								print("\033[91mThis is probably not what you meant!\033[m ({0}:{1})".format(filename, line[:-1]))
 								halt_required = True
-						if len(ln) > 3:
-							funtype = RedirectType(FunctionType(ln[:2] + ln[3:]))
+						if len(origLine) > 3:
+							funtype = RedirectType(FunctionType(origLine[:2] + origLine[3:]))
 						else:
-							funtype = RedirectType(FunctionType(ln[:2] + "v"))
+							funtype = RedirectType(FunctionType(origLine[:2] + "v"))
 						# filename isn't stored with the '_private.h' part
-						mytypedefs.setdefault(filename[:-10], {})
-						mytypedefs[filename[:-10]].setdefault(funtype, [])
-						mytypedefs[filename[:-10]][funtype].append(funname)
+						typedefs.setdefault(funtype, [])
+						typedefs[funtype].append(funname)
 					elif (gotype == "GOM") or (gotype == "GOWM"):
 						# OK on box64 for a GOM to not have emu...
-						funtype = RedirectType(FunctionType(ln))
-						mytypedefs.setdefault(filename[:-10], {})
-						mytypedefs[filename[:-10]].setdefault(funtype, [])
-						mytypedefs[filename[:-10]][funtype].append(funname)
+						funtype = RedirectType(FunctionType(origLine))
+						typedefs.setdefault(funtype, [])
+						typedefs[funtype].append(funname)
 						# print("\033[94mAre you sure of this?\033[m ({0}:{1})".format(filename, line[:-1]))
 						# halt_required = True
+					elif hasFlatStructure:
+						# Still put the type in typedefs, but don't add the function name
+						typedefs.setdefault(RedirectType(FunctionType(origLine)), [])
+				
+				# If the line is a structure metadata information...
+				elif ln.startswith("//%S"):
+					metadata = [e for e in ln.split() if e]
+					if len(metadata) != 4:
+						raise NotImplementedError("Invalid structure metadata supply (too many fields) ({0}:{1})".format(filename, line[:-1]))
+					if metadata[0] != "//%S":
+						raise NotImplementedError("Invalid structure metadata supply (invalid signature) ({0}:{1})".format(filename, line[:-1]))
+					if len(metadata[1]) != 1:
+						# If you REALLY need it, consider opening a ticket
+						# Before you do, consider that everything that is a valid in a C token is valid here too
+						raise NotImplementedError("Structure names cannot be of length greater than 1 ({0}:{1})".format(filename, line[:-1]))
+					if metadata[3] == "":
+						# If you need this, please open an issue (this is never actually called, empty strings are removed)
+						raise NotImplementedError("Invalid structure metadata supply (empty replacement) ({0}:{1})".format(filename, line[:-1]))
+					if any(c not in FunctionType.values for c in metadata[3]):
+						# Note that replacement cannot be another structure type
+						raise NotImplementedError("Invalid structure metadata supply (invalid replacement) ({0}:{1})".format(filename, line[:-1]))
+					if metadata[1] in mystructs:
+						raise NotImplementedError("Invalid structure nickname {0} (duplicate) ({1}/{2})".format(metadata[1], filename, line[:-1]))
+					if (metadata[1] in FunctionType.values) or (metadata[1] in ['0', '1']):
+						raise NotImplementedError("Invalid structure nickname {0} (reserved) ({1}/{2})".format(metadata[1], filename, line[:-1]))
+					
+					# OK, add into the database
+					mystructs[metadata[1]] = (StructType(metadata[2]), metadata[3])
+				
+				# If the line contains any symbol name...
 				elif ("GO" in ln) or ("DATA" in ln):
 					# Probably "//GO(..., " or "DATA(...," at least
 					try:
 						funname = ln.split('(')[1].split(',')[0].strip()
-						add_function_name(funname)
+						add_symbol_name(funname)
 					except IndexError:
 						# Oops, it wasn't...
 						pass
 		
-		add_function_name(None)
+		add_symbol_name(None)
 	
 	if halt_required:
 		raise ValueError("Fix all previous errors before proceeding")
@@ -378,18 +569,10 @@ def readFiles(files: Sequence[Filename]) -> \
 		print("(Also, the program WILL crash later if you proceed.)")
 		sys.exit(2) # Check what you did, not proceeding
 	
-	return gbl, redirects, mytypedefs
+	return gbl, redirects, filespec
 
-COrderedDict = Tuple[Dict[T, U], List[T]]
-def sortArrays(
-	gbl_tmp   : Dict[str,      List[FunctionType]],
-	red_tmp   : Dict[str,      Dict[RedirectType, FunctionType]],
-	mytypedefs: Dict[Filename, Dict[RedirectType, List[str]]]) -> \
-		Tuple[
-			COrderedDict[ClausesStr, List[FunctionType]],
-			COrderedDict[ClausesStr, List[Tuple[RedirectType, FunctionType]]],
-			Dict[Filename, COrderedDict[RedirectType, List[str]]]
-		]:
+def sortArrays(gbl_tmp : JumbledGlobals, red_tmp : JumbledRedirects, filespec: JumbledFilesSpecific) \
+ -> Tuple[SortedGlobals, SortedRedirects, SortedFilesSpecific]:
 	# Now, take all function types, and make a new table gbl_vals
 	# This table contains all #if conditions for when a function type needs to
 	# be generated. There is also a filter to avoid duplicate/opposite clauses.
@@ -443,7 +626,7 @@ def sortArrays(
 		key = str(clauses)
 		gbl.setdefault(key, [])
 		gbl[key].append(k1)
-		if (key not in gbl_idxs) and (clauses.definess != []):
+		if key not in gbl_idxs:
 			gbl_idxs.append(key)
 	# Sort the #if clauses as defined in `splitdef`
 	gbl_idxs.sort(key=lambda c: Clauses(c).splitdef())
@@ -476,7 +659,7 @@ def sortArrays(
 			
 			else:
 				redirects_vals[(v, red_tmp[k1][v])] = Clauses([Clause(k1)])
-	# Also does the same trick as before (also helps keep the order
+	# Also do the same trick as before (it also helps keep the order
 	# in the file deterministic)
 	redirects: Dict[ClausesStr, List[Tuple[RedirectType, FunctionType]]] = {}
 	redirects_idxs: List[ClausesStr] = []
@@ -485,7 +668,7 @@ def sortArrays(
 		key = str(clauses)
 		redirects.setdefault(key, [])
 		redirects[key].append((k1, v))
-		if (key not in redirects_idxs) and (clauses.definess != []):
+		if key not in redirects_idxs:
 			redirects_idxs.append(key)
 	redirects_idxs.sort(key=lambda c: Clauses(c).splitdef())
 	
@@ -498,59 +681,45 @@ def sortArrays(
 		redirects[k3].sort(key=lambda v: v[0].splitchar() + v[1].splitchar())
 	FunctionType.values = FunctionType.values[:-2]
 	
-	mytypedefs_vals: Dict[Filename, List[RedirectType]] = dict((fn, sorted(mytypedefs[fn].keys(), key=FunctionType.splitchar)) for fn in mytypedefs)
-	for fn in mytypedefs:
-		for v in mytypedefs_vals[fn]:
-			mytypedefs[fn][v].sort()
-	
-	return (gbl, gbl_idxs), (redirects, redirects_idxs), \
-		dict((fn, (mytypedefs[fn], mytypedefs_vals[fn])) for fn in mytypedefs)
-	
-def main(root: str, files: Sequence[Filename], ver: str):
-	"""
-	main -- The main function
-	
-	root: the root path (where the CMakeLists.txt is located)
-	files: a list of files to parse (wrapped*.h)
-	ver: version number
-	"""
-	
-	# gbl_tmp:
-	#  "defined() && ..." -> [vFv, ...]
-	# red_tmp:
-	#  "defined() && ..." -> [vFEv -> vFv, ...]
-	# tdf_tmp:
-	#  "filename" -> [vFEv -> fopen, ...]
-	gbl_tmp: Dict[ClausesStr, List[FunctionType]]
-	red_tmp: Dict[ClausesStr, Dict[RedirectType, FunctionType]]
-	tdf_tmp: Dict[Filename,   Dict[RedirectType, List[str]]]
-	
-	gbl_tmp, red_tmp, tdf_tmp = readFiles(files)
-	
-	gbls      : COrderedDict[ClausesStr, List[FunctionType]]
-	redirects_: COrderedDict[ClausesStr, List[Tuple[RedirectType, FunctionType]]]
-	mytypedefs: Dict[Filename, COrderedDict[RedirectType, List[str]]]
-	
-	gbls, redirects_, mytypedefs = \
-		sortArrays(gbl_tmp, red_tmp, tdf_tmp)
-	
-	gbl, gbl_idxs = gbls
-	redirects, redirects_idxs = redirects_
+	sortedfilespec: SortedFilesSpecific = {}
+	for fn in filespec:
+		# Maybe do better?
+		mystructs_vals: List[str] = sorted(filespec[fn][1].keys())
+		if mystructs_vals != []:
+			FunctionType.values = FunctionType.values + list(mystructs_vals)
+		
+		mytypedefs_vals: List[RedirectType] = sorted(filespec[fn][0].keys(), key=FunctionType.splitchar)
+		sortedfilespec[fn] = (
+			CustOrderedDict(dict((v, sorted(filespec[fn][0][v])) for v in mytypedefs_vals), mytypedefs_vals),
+			CustOrderedDict(filespec[fn][2], sorted(filespec[fn][2], key=FunctionType.splitchar))
+		)
+		
+		if mystructs_vals != []:
+			FunctionType.values = FunctionType.values[:-len(mystructs_vals)]
 	
+	return CustOrderedDict(gbl, gbl_idxs), CustOrderedDict(redirects, redirects_idxs), sortedfilespec
+
+def checkRun(root: str, jumbled: JumbledFilesSpecific, \
+  gbls: SortedGlobals, redirects: SortedRedirects, filesspec: SortedFilesSpecific) -> Optional[str]:
 	# Check if there was any new functions compared to last run
 	functions_list: str = ""
-	for k in [str(Clauses())] + gbl_idxs:
-		for v in gbl[k]:
+	for k in gbls:
+		for v in gbls[k]:
 			functions_list = functions_list + "#" + k + " " + v + "\n"
-	for k in [str(Clauses())] + redirects_idxs:
+	for k in redirects:
 		for vr, vf in redirects[k]:
 			functions_list = functions_list + "#" + k + " " + vr + " -> " + vf + "\n"
-	for filename in sorted(mytypedefs.keys()):
+	for filename in sorted(filesspec.keys()):
 		functions_list = functions_list + filename + ":\n"
-		for vr in mytypedefs[filename][1]:
+		for st in sorted(jumbled[filename][1].keys()):
+			functions_list = functions_list + \
+				"% " + st + " " + jumbled[filename][1][st][0] + " " + jumbled[filename][1][st][1] + "\n"
+		for vr in filesspec[filename][0]:
 			functions_list = functions_list + "- " + vr + ":\n"
-			for fn in mytypedefs[filename][0][vr]:
+			for fn in filesspec[filename][0][vr]:
 				functions_list = functions_list + "  - " + fn + "\n"
+		for defined in filesspec[filename][1]:
+			functions_list = functions_list + "% " + defined + "\n"
 	
 	# functions_list is a unique string, compare it with the last run
 	try:
@@ -561,12 +730,56 @@ def main(root: str, files: Sequence[Filename], ver: str):
 			# Mark as OK for CMake
 			with open(os.path.join(root, "src", "wrapped", "generated", "functions_list.txt"), 'w') as file:
 				file.write(functions_list)
-			print("Detected same build as last run, skipping")
-			return 0
+			return None
 	except IOError:
 		# The file does not exist yet, first run
 		pass
 	
+	return functions_list
+
+def main(root: str, files: Iterable[Filename], ver: str):
+	"""
+	main -- The main function
+	
+	root: the root path (where the CMakeLists.txt is located)
+	files: a list of files to parse (wrapped*.h)
+	ver: version number
+	"""
+	
+	# gbl_tmp:
+	#  "defined() && ..." -> [vFv, ...]
+	# red_tmp:
+	#  "defined() && ..." -> [vFEv -> vFv, ...]
+	# fsp_tmp:
+	#  "filename" -> (
+	#   [vFEv -> fopen, ...],
+	#   [G -> ("SDL_J...", UU), ...],
+	#   [vFGppp -> vFUUppp, ...]
+	#  )
+	gbl_tmp: JumbledGlobals
+	red_tmp: JumbledRedirects
+	fsp_tmp: JumbledFilesSpecific
+	
+	gbl_tmp, red_tmp, fsp_tmp = readFiles(files)
+	
+	# gbls: sorted gbl_tmp
+	# redirects: sorted red_tmp
+	# filesspec:
+	#  "filename" -> (
+	#   sorted [vFEv -> fopen, ...],
+	#   sorted [vFGppp -> vFUUppp, ...]
+	#  )
+	gbls     : SortedGlobals
+	redirects: SortedRedirects
+	filesspec: SortedFilesSpecific
+	
+	gbls, redirects, filesspec = sortArrays(gbl_tmp, red_tmp, fsp_tmp)
+	
+	functions_list = checkRun(root, fsp_tmp, gbls, redirects, filesspec)
+	if functions_list is None:
+		print("Detected same build as last run, skipping")
+		return 0
+	
 	# Detect simple wrappings
 	simple_wraps: Dict[ClausesStr, List[Tuple[FunctionType, int]]] = {}
 	
@@ -583,132 +796,163 @@ def main(root: str, files: Sequence[Filename], ver: str):
 	assert(all(c not in allowed_simply + allowed_regs + allowed_fpr for c in forbidden_simple))
 	assert(all(c in allowed_simply + allowed_regs + allowed_fpr + forbidden_simple for c in FunctionType.values))
 	
-	# Only search on real wrappers
-	for k in [str(Clauses())] + gbl_idxs:
-		for v in gbl[k]:
-			regs_count: int = 0
-			fpr_count : int = 0
-			
-			if v[0] in forbidden_simple:
+	def check_simple(v: FunctionType):
+		regs_count: int = 0
+		fpr_count : int = 0
+		
+		if v[0] in forbidden_simple:
+			return None
+		for c in v[2:]:
+			if c in allowed_regs:
+				regs_count = regs_count + 1
+			elif c in allowed_fpr:
+				fpr_count = fpr_count + 1
+			elif c in allowed_simply:
 				continue
-			for c in v[2:]:
-				if c in allowed_regs:
-					regs_count = regs_count + 1
-				elif c in allowed_fpr:
-					fpr_count = fpr_count + 1
-				elif c in allowed_simply:
-					continue
-				else:
-					break
 			else:
-				# No character in forbidden_simply
-				if (regs_count <= 6) and (fpr_count <= 8):
-					# All checks passed!
-					ret_val = 1 + fpr_count
-					if v[0] in allowed_fpr:
-						ret_val = -ret_val
-					simple_wraps.setdefault(k, []).append((v, ret_val))
-	simple_idxs = list(simple_wraps.keys())
-	simple_idxs.sort(key=lambda x: Clauses(x).splitdef())
+				return None
+		# No character in forbidden_simply
+		if (regs_count <= 6) and (fpr_count <= 8):
+			# All checks passed!
+			ret_val = 1 + fpr_count
+			if v[0] in allowed_fpr:
+				ret_val = -ret_val
+			return ret_val
+		else:
+			# Too many arguments...
+			return None
+	
+	# Only search in real wrappers (mapped ones are nearly always not simple)
+	for k in gbls:
+		tmp = [ (v, ret_val) for v, ret_val in map(lambda v: (v, check_simple(v)), gbls[k]) if ret_val is not None ]
+		if tmp:
+			simple_wraps[k] = tmp
+	simple_idxs = sorted(simple_wraps.keys(), key=lambda x: Clauses(x).splitdef())
 	
 	# Now the files rebuilding part
 	# File headers and guards
 	files_header = {
-		"wrapper.c": """/*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v{version}) *
- *******************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-#include "wrapper.h"
-#include "emu/x64emu_private.h"
-#include "emu/x87emu_private.h"
-#include "regs.h"
-#include "x64emu.h"
-
-extern void* my__IO_2_1_stdin_ ;
-extern void* my__IO_2_1_stdout_;
-extern void* my__IO_2_1_stderr_;
-
-static void* io_convert(void* v)
-{lbr}
-	if(!v)
-		return v;
-	if(v == my__IO_2_1_stdin_)
-		return stdin;
-	if(v == my__IO_2_1_stdout_)
-		return stdout;
-	if(v == my__IO_2_1_stderr_)
-		return stderr;
-	return v;
-{rbr}
-
-#define ST0val ST0.d
-
-int of_convert(int);
-
-""",
-		"wrapper.h": """/*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v{version}) *
- *******************************************************************/
-#ifndef __WRAPPER_H_
-#define __WRAPPER_H_
-#include <stdint.h>
-#include <string.h>
-
-typedef struct x64emu_s x64emu_t;
-
-// the generic wrapper pointer functions
-typedef void (*wrapper_t)(x64emu_t* emu, uintptr_t fnc);
-
-// list of defined wrapper
-// E = current x86emu struct
-// v = void
-// C = unsigned byte c = char
-// W = unsigned short w = short
-// u = uint32, i = int32
-// U = uint64, I= int64
-// L = unsigned long, l = signed long (long is an int with the size of a pointer)
-// H = Huge 128bits value/struct
-// p = pointer, P = void* on the stack
-// f = float, d = double, D = long double, K = fake long double
-// V = vaargs
-// O = libc O_ flags bitfield
-// o = stdout
-// S = _IO_2_1_stdXXX_ pointer (or FILE*)
-// N = ... automatically sending 1 arg
-// M = ... automatically sending 2 args
-// A = va_list
-// 0 = constant 0, 1 = constant 1
-
-""",
-		"fntypes.h": """/*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v{version}) *
- *******************************************************************/
-#ifndef __{filename}TYPES_H_
-#define __{filename}TYPES_H_
-
-#ifndef LIBNAME
-#error You should only #include this file inside a wrapped*.c file
-#endif
-#ifndef ADDED_FUNCTIONS
-#define ADDED_FUNCTIONS() 
-#endif
-
-"""
+		"wrapper.c": """
+		#include <stdio.h>
+		#include <stdlib.h>
+		#include <stdint.h>
+		
+		#include "wrapper.h"
+		#include "emu/x64emu_private.h"
+		#include "emu/x87emu_private.h"
+		#include "regs.h"
+		#include "x64emu.h"
+		
+		extern void* my__IO_2_1_stdin_ ;
+		extern void* my__IO_2_1_stdout_;
+		extern void* my__IO_2_1_stderr_;
+		
+		static void* io_convert(void* v)
+		{lbr}
+			if(!v)
+				return v;
+			if(v == my__IO_2_1_stdin_)
+				return stdin;
+			if(v == my__IO_2_1_stdout_)
+				return stdout;
+			if(v == my__IO_2_1_stderr_)
+				return stderr;
+			return v;
+		{rbr}
+		
+		#define ST0val ST0.d
+		
+		int of_convert(int);
+		
+		""",
+		"wrapper.h": """
+		#ifndef __WRAPPER_H_
+		#define __WRAPPER_H_
+		#include <stdint.h>
+		#include <string.h>
+		
+		typedef struct x64emu_s x64emu_t;
+		
+		// the generic wrapper pointer functions
+		typedef void (*wrapper_t)(x64emu_t* emu, uintptr_t fnc);
+		
+		// list of defined wrapper
+		// E = current x86emu struct
+		// v = void
+		// C = unsigned byte c = char
+		// W = unsigned short w = short
+		// u = uint32, i = int32
+		// U = uint64, I = int64
+		// L = unsigned long, l = signed long (long is an int with the size of a pointer)
+		// H = Huge 128bits value/struct
+		// p = pointer, P = void* on the stack
+		// f = float, d = double, D = long double, K = fake long double
+		// V = vaargs
+		// O = libc O_ flags bitfield
+		// o = stdout
+		// S = _IO_2_1_stdXXX_ pointer (or FILE*)
+		// N = ... automatically sending 1 arg
+		// M = ... automatically sending 2 args
+		// A = va_list
+		// 0 = constant 0, 1 = constant 1
+		
+		""",
+		"fntypes.h": """
+		#ifndef __{filename}TYPES_H_
+		#define __{filename}TYPES_H_
+		
+		#ifndef LIBNAME
+		#error You should only #include this file inside a wrapped*.c file
+		#endif
+		#ifndef ADDED_FUNCTIONS
+		#define ADDED_FUNCTIONS() 
+		#endif
+		
+		""",
+		"fndefs.h": """
+		#ifndef __{filename}DEFS_H_
+		#define __{filename}DEFS_H_
+		
+		""",
+		"fnundefs.h": """
+		#ifndef __{filename}UNDEFS_H_
+		#define __{filename}UNDEFS_H_
+		
+		"""
 	}
-	files_guard = {"wrapper.c": """""",
+	files_guard = {
+		"wrapper.c": """
+		""",
 		"wrapper.h": """
-int isSimpleWrapper(wrapper_t fun);
-
-#endif // __WRAPPER_H_
-""",
+		
+		int isSimpleWrapper(wrapper_t fun);
+		
+		#endif // __WRAPPER_H_
+		""",
 		"fntypes.h": """
-#endif // __{filename}TYPES_H_
-"""
+		
+		#endif // __{filename}TYPES_H_
+		""",
+		"fndefs.h": """
+		
+		#endif // __{filename}DEFS_H_
+		""",
+		"fnundefs.h": """
+		
+		#endif // __{filename}UNDEFS_H_
+		"""
 	}
 	
+	banner = "/********************************************************" + ('*'*len(ver)) + "***\n" \
+	         " * File automatically generated by rebuild_wrappers.py (v" + ver + ") *\n" \
+	         " ********************************************************" + ('*'*len(ver)) + "***/\n"
+	trim = lambda string: '\n'.join(line[2:] for line in string.splitlines())[1:]
+	# Yes, the for loops are inversed. This is because both dicts should have the same keys.
+	for fhdr in files_guard:
+		files_header[fhdr] = banner + trim(files_header[fhdr])
+	for fhdr in files_header:
+		files_guard[fhdr] = trim(files_guard[fhdr])
+	
 	# Rewrite the wrapper.c file:
 	# i and u should only be 32 bits
 	#            E            v       c         w          i          I          C          W           u           U           f        d         D              K         l           L            p        V        O          S        N      M      H                    P        A
@@ -716,7 +960,7 @@ int isSimpleWrapper(wrapper_t fun);
 	if len(FunctionType.values) != len(td_types):
 		raise NotImplementedError("len(values) = {lenval} != len(td_types) = {lentypes}".format(lenval=len(FunctionType.values), lentypes=len(td_types)))
 	
-	def generate_typedefs(arr: Sequence[FunctionType], file) -> None:
+	def generate_typedefs(arr: Iterable[FunctionType], file) -> None:
 		for v in arr:
 			file.write("typedef " + td_types[FunctionType.values.index(v[0])] + " (*" + v + "_t)"
 				+ "(" + ', '.join(td_types[FunctionType.values.index(t)] for t in v[2:]) + ");\n")
@@ -725,11 +969,12 @@ int isSimpleWrapper(wrapper_t fun);
 		file.write(files_header["wrapper.c"].format(lbr="{", rbr="}", version=ver))
 		
 		# First part: typedefs
-		generate_typedefs(gbl[str(Clauses())], file)
-		for k in gbl_idxs:
-			file.write("\n#if " + k + "\n")
-			generate_typedefs(gbl[k], file)
-			file.write("#endif\n")
+		for k in gbls:
+			if k != str(Clauses()):
+				file.write("\n#if " + k + "\n")
+			generate_typedefs(gbls[k], file)
+			if k != str(Clauses()):
+				file.write("#endif\n")
 		
 		file.write("\n")
 		
@@ -917,7 +1162,7 @@ int isSimpleWrapper(wrapper_t fun);
 			raise NotImplementedError("Something in the stack has a null offset and a non-empty arg string")
 		if any(map(lambda v, a: (a != "") and (v == 0), vother, arg_o)):
 			raise NotImplementedError("Something in the stack has a null offset and a non-empty arg string")
-		# Everything is either in the stack or somewhere else, it cannot be in a GPr and in an XMMr...
+		# Everything is either in the stack or somewhere else, it cannot be in a GPr and in an XMMr, etc
 		if any(map(lambda o, s: (o == 0) == (s == 0), vother, vstack)):
 			raise NotImplementedError("Something cannot be in exactly one of the stack and somewhere else")
 		if any(map(lambda r, x: (r > 0) and (x > 0), vreg, vxmm)):
@@ -973,34 +1218,34 @@ int isSimpleWrapper(wrapper_t fun);
 			# Generic function
 			f.write(vals[FunctionType.values.index(N[0])].format(function_args(N[2:])[:-2]) + " }\n")
 		
-		for v in gbl[str(Clauses())]:
-			if v == FunctionType("vFv"):
-				# Suppress all warnings...
-				file.write("void vFv(x64emu_t *emu, uintptr_t fcn) { vFv_t fn = (vFv_t)fcn; fn(); (void)emu; }\n")
-			else:
-				function_writer(file, v, v + "_t")
-		for k in gbl_idxs:
-			file.write("\n#if " + k + "\n")
-			for v in gbl[k]:
-				function_writer(file, v, v + "_t")
-			file.write("#endif\n")
+		for k in gbls:
+			if k != str(Clauses()):
+				file.write("\n#if " + k + "\n")
+			for v in gbls[k]:
+				if v == FunctionType("vFv"):
+					# Suppress all warnings...
+					file.write("void vFv(x64emu_t *emu, uintptr_t fcn) { vFv_t fn = (vFv_t)fcn; fn(); (void)emu; }\n")
+				else:
+					function_writer(file, v, v + "_t")
+			if k != str(Clauses()):
+				file.write("#endif\n")
 		file.write("\n")
-		for vr, vf in redirects[str(Clauses())]:
-			function_writer(file, vr, vf + "_t")
-		for k in redirects_idxs:
-			file.write("\n#if " + k + "\n")
+		for k in redirects:
+			if k != str(Clauses()):
+				file.write("\n#if " + k + "\n")
 			for vr, vf in redirects[k]:
 				function_writer(file, vr, vf + "_t")
-			file.write("#endif\n")
+			if k != str(Clauses()):
+				file.write("#endif\n")
 		
 		# Write the isSimpleWrapper function
 		file.write("\nint isSimpleWrapper(wrapper_t fun) {\n")
 		for k in simple_idxs:
-			if k != "()":
+			if k != str(Clauses()):
 				file.write("#if " + k + "\n")
-			for v in simple_wraps[k]:
-				file.write("\tif (fun == &" + v[0] + ") return " + str(v[1]) + ";\n")
-			if k != "()":
+			for vf, val in simple_wraps[k]:
+				file.write("\tif (fun == &" + vf + ") return " + str(val) + ";\n")
+			if k != str(Clauses()):
 				file.write("#endif\n")
 		file.write("\treturn 0;\n}\n")
 		
@@ -1010,37 +1255,57 @@ int isSimpleWrapper(wrapper_t fun);
 	with open(os.path.join(root, "src", "wrapped", "generated", "wrapper.h"), 'w') as file:
 		file.write(files_header["wrapper.h"].format(lbr="{", rbr="}", version=ver))
 		# Normal function types
-		for v in gbl[str(Clauses())]:
-			file.write("void " + v + "(x64emu_t *emu, uintptr_t fnc);\n")
-		for k in gbl_idxs:
-			file.write("\n#if " + k + "\n")
-			for v in gbl[k]:
+		for k in gbls:
+			if k != str(Clauses()):
+				file.write("\n#if " + k + "\n")
+			for v in gbls[k]:
 				file.write("void " + v + "(x64emu_t *emu, uintptr_t fnc);\n")
-			file.write("#endif\n")
+			if k != str(Clauses()):
+				file.write("#endif\n")
 		file.write("\n")
 		# Redirects
-		for vr, _ in redirects[str(Clauses())]:
-			file.write("void " + vr + "(x64emu_t *emu, uintptr_t fnc);\n")
-		for k in redirects_idxs:
-			file.write("\n#if " + k + "\n")
+		for k in redirects:
+			if k != str(Clauses()):
+				file.write("\n#if " + k + "\n")
 			for vr, _ in redirects[k]:
 				file.write("void " + vr + "(x64emu_t *emu, uintptr_t fnc);\n")
-			file.write("#endif\n")
+			if k != str(Clauses()):
+				file.write("#endif\n")
 		file.write(files_guard["wrapper.h"].format(lbr="{", rbr="}", version=ver))
 	
 	# Rewrite the *types.h files:
 	td_types[FunctionType.values.index('A')] = "va_list"
 	td_types[FunctionType.values.index('V')] = "..."
-	for fn in mytypedefs:
+	orig_val_len = len(FunctionType.values)
+	for fn in filesspec:
+		for strc in fsp_tmp[fn][1]:
+			FunctionType.values.append(strc)
+			td_types.append(fsp_tmp[fn][1][strc][0])
+		
 		with open(os.path.join(root, "src", "wrapped", "generated", fn + "types.h"), 'w') as file:
 			file.write(files_header["fntypes.h"].format(lbr="{", rbr="}", version=ver, filename=fn))
-			generate_typedefs(mytypedefs[fn][1], file)
+			generate_typedefs(filesspec[fn][0], file)
 			file.write("\n#define SUPER() ADDED_FUNCTIONS()")
-			for v in mytypedefs[fn][1]:
-				for f in mytypedefs[fn][0][v]:
-					file.write(" \\\n\tGO({0}, {1}_t)".format(f, v))
+			for r in filesspec[fn][0]:
+				for f in filesspec[fn][0][r]:
+					file.write(" \\\n\tGO({0}, {1}_t)".format(f, r))
 			file.write("\n")
 			file.write(files_guard["fntypes.h"].format(lbr="{", rbr="}", version=ver, filename=fn))
+		
+		with open(os.path.join(root, "src", "wrapped", "generated", fn + "defs.h"), 'w') as file:
+			file.write(files_header["fndefs.h"].format(lbr="{", rbr="}", version=ver, filename=fn))
+			for defined in filesspec[fn][1]:
+				file.write("#define {defined} {define}\n".format(defined=defined, define=filesspec[fn][1][defined]))
+			file.write(files_guard["fndefs.h"].format(lbr="{", rbr="}", version=ver, filename=fn))
+		
+		with open(os.path.join(root, "src", "wrapped", "generated", fn + "undefs.h"), 'w') as file:
+			file.write(files_header["fnundefs.h"].format(lbr="{", rbr="}", version=ver, filename=fn))
+			for defined in filesspec[fn][1]:
+				file.write("#undef {defined}\n".format(defined=defined))
+			file.write(files_guard["fnundefs.h"].format(lbr="{", rbr="}", version=ver, filename=fn))
+		
+		FunctionType.values = FunctionType.values[:orig_val_len]
+		td_types = td_types[:orig_val_len]
 	
 	# Save the string for the next iteration, writing was successful
 	with open(os.path.join(root, "src", "wrapped", "generated", "functions_list.txt"), 'w') as file:
@@ -1055,5 +1320,6 @@ if __name__ == '__main__':
 			limit.append(i)
 	Define.defines = list(map(DefineType, sys.argv[2:limit[0]]))
 	if main(sys.argv[1], sys.argv[limit[0]+1:], "2.0.2.15") != 0:
+	#if main(sys.argv[1], sys.argv[limit[0]+1:], "2.1.0.16") != 0: TODO TYPES!!!!!
 		exit(2)
 	exit(0)
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 7510dcee..bbb90753 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -802,6 +802,7 @@
 #() vFupupi
 #() vFuppip
 #() vFupppp
+#() vFUUppp
 #() vFfffff
 #() vFddddp
 #() vFpiiii
@@ -1515,6 +1516,11 @@
 #() iFEpvvppp -> iFEpppp
 #() iFEpLvvpp -> iFEpLpp
 #() iFEpuvvppp -> iFEpuppp
+wrappedalure:
+wrappedalut:
+wrappedatk:
+wrappedatkbridge:
+wrappedatspi:
 wrappedbz2:
 - iFp:
   - BZ2_bzCompressEnd
@@ -1526,6 +1532,8 @@ wrappedbz2:
   - BZ2_bzDecompressInit
 - iFpiii:
   - BZ2_bzCompressInit
+wrappedcairo:
+wrappedcrashhandler:
 wrappedcrypto:
 - vFp:
   - CRYPTO_set_id_callback
@@ -1587,6 +1595,7 @@ wrappedflac:
   - FLAC__metadata_chain_read_with_callbacks
 - iFppppppppp:
   - FLAC__stream_decoder_init_stream
+wrappedfontconfig:
 wrappedfreetype:
 - iFpplp:
   - FT_Open_Face
@@ -1598,6 +1607,7 @@ wrappedgnutls:
 - vFpp:
   - gnutls_transport_set_pull_function
   - gnutls_transport_set_push_function
+wrappedgssapikrb5:
 wrappedkrb5:
 - iFppppppipp:
   - krb5_get_init_creds_password
@@ -1813,6 +1823,8 @@ wrappedlibc:
   - mmap64
 - iFpippppp:
   - __libc_start_main
+wrappedlibcrypt:
+wrappedlibcups:
 wrappedlibdl:
 - iFp:
   - dlclose
@@ -1830,6 +1842,8 @@ wrappedlibdl:
   - dlmopen
 - pFppp:
   - dlvsym
+wrappedlibform:
+wrappedlibformw:
 wrappedlibgl:
 - iFi:
   - glXSwapIntervalMESA
@@ -1847,6 +1861,7 @@ wrappedlibglu:
   - gluNurbsCallback
   - gluQuadricCallback
   - gluTessCallback
+wrappedlibice:
 wrappedlibm:
 - UFV:
   - cacosf
@@ -1920,6 +1935,9 @@ wrappedlibncursesw:
   - mvprintw
 - iFpiipV:
   - mvwprintw
+wrappedlibogg:
+wrappedlibpanel:
+wrappedlibpcre:
 wrappedlibpthread:
 - vFp:
   - __pthread_register_cancel
@@ -2008,6 +2026,7 @@ wrappedlibpthread:
   - pthread_cond_timedwait
 - iFpppp:
   - pthread_create
+wrappedlibresolv:
 wrappedlibrt:
 - iFupp:
   - timer_create
@@ -2038,6 +2057,8 @@ wrappedlibtinfo:
 wrappedlibtinfo6:
 - iFpip:
   - tputs
+wrappedlibuuid:
+wrappedlibvorbis:
 wrappedlibx11:
 - iFp:
   - XDestroyImage
@@ -2076,6 +2097,21 @@ wrappedlibx11:
   - XCreateImage
 - pFppiiuuuipii:
   - XGetSubImage
+wrappedlibx11xcb:
+wrappedlibxau:
+wrappedlibxcb:
+wrappedlibxcbglx:
+wrappedlibxcbimage:
+wrappedlibxcbkeysyms:
+wrappedlibxcbrandr:
+wrappedlibxcbshape:
+wrappedlibxcbshm:
+wrappedlibxcbxfixes:
+wrappedlibxcbxtest:
+wrappedlibxcomposite:
+wrappedlibxcursor:
+wrappedlibxdamage:
+wrappedlibxdmcp:
 wrappedlibxext:
 - pFp:
   - XSetExtensionErrorHandler
@@ -2087,6 +2123,14 @@ wrappedlibxext:
   - XShmCreateImage
 - iFppppiiiiuui:
   - XShmPutImage
+wrappedlibxfixes:
+wrappedlibxft:
+wrappedlibxi:
+wrappedlibxmu:
+wrappedlibxpm:
+wrappedlibxrandr:
+wrappedlibxrender:
+wrappedlibxss:
 wrappedlibxt:
 - vFpuipp:
   - XtAddEventHandler
@@ -2094,6 +2138,7 @@ wrappedlibxtst:
 - iFpppp:
   - XRecordEnableContext
   - XRecordEnableContextAsync
+wrappedlibxxf86vm:
 wrappedlibz:
 - iFp:
   - deflateEnd
@@ -2131,6 +2176,8 @@ wrappedopenal:
 wrappedpango:
 - vFpp:
   - pango_attribute_init
+wrappedpangocairo:
+wrappedpangoft2:
 wrappedpng16:
 - vFpp:
   - png_set_read_user_transform_fn
@@ -2232,6 +2279,7 @@ wrappedpulse:
   - pa_context_set_source_volume_by_name
 - iFppLpIi:
   - pa_stream_write
+wrappedpulsesimple:
 wrappedsdl1:
 - vFp:
   - SDL_KillThread
@@ -2328,6 +2376,7 @@ wrappedsdl1mixer:
   - Mix_LoadMUSType_RW
 - iFippp:
   - Mix_RegisterEffect
+wrappedsdl1net:
 wrappedsdl1sound:
 - pFpppu:
   - Sound_NewSample
@@ -2337,6 +2386,7 @@ wrappedsdl1ttf:
 - pFpiii:
   - TTF_OpenFontIndexRW
 wrappedsdl2:
+% G SDL_JoystickGUID UU
 - vFp:
   - SDL_UnloadObject
 - iFv:
@@ -2439,6 +2489,8 @@ wrappedsdl2:
   - SDL_CreateThread
 - vFpuup:
   - SDL_qsort
+- vFGppp:
+  - SDL_GetJoystickGUIDInfo
 - iFpLpp:
   - SDL_vsnprintf
 - iFpLpV:
@@ -2446,12 +2498,11 @@ wrappedsdl2:
 - uFppuu:
   - SDL_RWread
   - SDL_RWwrite
-- vFppppp:
-  - SDL_GetJoystickGUIDInfo
 - iFpippi:
   - SDL_OpenAudioDevice
 - pFpippp:
   - SDL_LoadWAV_RW
+% vFGppp
 wrappedsdl2image:
 - pFp:
   - IMG_LoadBMP_RW
@@ -2497,6 +2548,7 @@ wrappedsdl2mixer:
   - Mix_LoadMUSType_RW
 - iFippp:
   - Mix_RegisterEffect
+wrappedsdl2net:
 wrappedsdl2ttf:
 - pFpii:
   - TTF_OpenFontRW
@@ -2532,6 +2584,9 @@ wrappedvorbisfile:
 - iFppplPPPP:
   - ov_open_callbacks
   - ov_test_callbacks
+wrappedxinerama:
+wrappedxkbcommon:
+wrappedxkbcommonx11:
 wrappedxml2:
 - vFp:
   - xmlSetExternalEntityLoader
diff --git a/src/wrapped/generated/wrappedaluredefs.h b/src/wrapped/generated/wrappedaluredefs.h
new file mode 100644
index 00000000..d6c506c1
--- /dev/null
+++ b/src/wrapped/generated/wrappedaluredefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedalureDEFS_H_
+#define __wrappedalureDEFS_H_
+
+
+#endif // __wrappedalureDEFS_H_
diff --git a/src/wrapped/generated/wrappedaluretypes.h b/src/wrapped/generated/wrappedaluretypes.h
new file mode 100644
index 00000000..c64bae92
--- /dev/null
+++ b/src/wrapped/generated/wrappedaluretypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedalureTYPES_H_
+#define __wrappedalureTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedalureTYPES_H_
diff --git a/src/wrapped/generated/wrappedalureundefs.h b/src/wrapped/generated/wrappedalureundefs.h
new file mode 100644
index 00000000..26a9e1a5
--- /dev/null
+++ b/src/wrapped/generated/wrappedalureundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedalureUNDEFS_H_
+#define __wrappedalureUNDEFS_H_
+
+
+#endif // __wrappedalureUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedalutdefs.h b/src/wrapped/generated/wrappedalutdefs.h
new file mode 100644
index 00000000..f288f832
--- /dev/null
+++ b/src/wrapped/generated/wrappedalutdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedalutDEFS_H_
+#define __wrappedalutDEFS_H_
+
+
+#endif // __wrappedalutDEFS_H_
diff --git a/src/wrapped/generated/wrappedaluttypes.h b/src/wrapped/generated/wrappedaluttypes.h
new file mode 100644
index 00000000..40f03e76
--- /dev/null
+++ b/src/wrapped/generated/wrappedaluttypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedalutTYPES_H_
+#define __wrappedalutTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedalutTYPES_H_
diff --git a/src/wrapped/generated/wrappedalutundefs.h b/src/wrapped/generated/wrappedalutundefs.h
new file mode 100644
index 00000000..d8e3e584
--- /dev/null
+++ b/src/wrapped/generated/wrappedalutundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedalutUNDEFS_H_
+#define __wrappedalutUNDEFS_H_
+
+
+#endif // __wrappedalutUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedatkbridgedefs.h b/src/wrapped/generated/wrappedatkbridgedefs.h
new file mode 100644
index 00000000..277699c4
--- /dev/null
+++ b/src/wrapped/generated/wrappedatkbridgedefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedatkbridgeDEFS_H_
+#define __wrappedatkbridgeDEFS_H_
+
+
+#endif // __wrappedatkbridgeDEFS_H_
diff --git a/src/wrapped/generated/wrappedatkbridgetypes.h b/src/wrapped/generated/wrappedatkbridgetypes.h
new file mode 100644
index 00000000..c716ea54
--- /dev/null
+++ b/src/wrapped/generated/wrappedatkbridgetypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedatkbridgeTYPES_H_
+#define __wrappedatkbridgeTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedatkbridgeTYPES_H_
diff --git a/src/wrapped/generated/wrappedatkbridgeundefs.h b/src/wrapped/generated/wrappedatkbridgeundefs.h
new file mode 100644
index 00000000..68dfcf4b
--- /dev/null
+++ b/src/wrapped/generated/wrappedatkbridgeundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedatkbridgeUNDEFS_H_
+#define __wrappedatkbridgeUNDEFS_H_
+
+
+#endif // __wrappedatkbridgeUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedatkdefs.h b/src/wrapped/generated/wrappedatkdefs.h
new file mode 100644
index 00000000..39b0484b
--- /dev/null
+++ b/src/wrapped/generated/wrappedatkdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedatkDEFS_H_
+#define __wrappedatkDEFS_H_
+
+
+#endif // __wrappedatkDEFS_H_
diff --git a/src/wrapped/generated/wrappedatktypes.h b/src/wrapped/generated/wrappedatktypes.h
new file mode 100644
index 00000000..530ed0b1
--- /dev/null
+++ b/src/wrapped/generated/wrappedatktypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedatkTYPES_H_
+#define __wrappedatkTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedatkTYPES_H_
diff --git a/src/wrapped/generated/wrappedatkundefs.h b/src/wrapped/generated/wrappedatkundefs.h
new file mode 100644
index 00000000..6988b19c
--- /dev/null
+++ b/src/wrapped/generated/wrappedatkundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedatkUNDEFS_H_
+#define __wrappedatkUNDEFS_H_
+
+
+#endif // __wrappedatkUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedatspidefs.h b/src/wrapped/generated/wrappedatspidefs.h
new file mode 100644
index 00000000..4dc0f614
--- /dev/null
+++ b/src/wrapped/generated/wrappedatspidefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedatspiDEFS_H_
+#define __wrappedatspiDEFS_H_
+
+
+#endif // __wrappedatspiDEFS_H_
diff --git a/src/wrapped/generated/wrappedatspitypes.h b/src/wrapped/generated/wrappedatspitypes.h
new file mode 100644
index 00000000..930d795e
--- /dev/null
+++ b/src/wrapped/generated/wrappedatspitypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedatspiTYPES_H_
+#define __wrappedatspiTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedatspiTYPES_H_
diff --git a/src/wrapped/generated/wrappedatspiundefs.h b/src/wrapped/generated/wrappedatspiundefs.h
new file mode 100644
index 00000000..07e6c215
--- /dev/null
+++ b/src/wrapped/generated/wrappedatspiundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedatspiUNDEFS_H_
+#define __wrappedatspiUNDEFS_H_
+
+
+#endif // __wrappedatspiUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedbz2defs.h b/src/wrapped/generated/wrappedbz2defs.h
new file mode 100644
index 00000000..61de9050
--- /dev/null
+++ b/src/wrapped/generated/wrappedbz2defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedbz2DEFS_H_
+#define __wrappedbz2DEFS_H_
+
+
+#endif // __wrappedbz2DEFS_H_
diff --git a/src/wrapped/generated/wrappedbz2undefs.h b/src/wrapped/generated/wrappedbz2undefs.h
new file mode 100644
index 00000000..38b8b29d
--- /dev/null
+++ b/src/wrapped/generated/wrappedbz2undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedbz2UNDEFS_H_
+#define __wrappedbz2UNDEFS_H_
+
+
+#endif // __wrappedbz2UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedcairodefs.h b/src/wrapped/generated/wrappedcairodefs.h
new file mode 100644
index 00000000..74ad9fdc
--- /dev/null
+++ b/src/wrapped/generated/wrappedcairodefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedcairoDEFS_H_
+#define __wrappedcairoDEFS_H_
+
+
+#endif // __wrappedcairoDEFS_H_
diff --git a/src/wrapped/generated/wrappedcairotypes.h b/src/wrapped/generated/wrappedcairotypes.h
new file mode 100644
index 00000000..143b0012
--- /dev/null
+++ b/src/wrapped/generated/wrappedcairotypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedcairoTYPES_H_
+#define __wrappedcairoTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedcairoTYPES_H_
diff --git a/src/wrapped/generated/wrappedcairoundefs.h b/src/wrapped/generated/wrappedcairoundefs.h
new file mode 100644
index 00000000..31435684
--- /dev/null
+++ b/src/wrapped/generated/wrappedcairoundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedcairoUNDEFS_H_
+#define __wrappedcairoUNDEFS_H_
+
+
+#endif // __wrappedcairoUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedcrashhandlerdefs.h b/src/wrapped/generated/wrappedcrashhandlerdefs.h
new file mode 100644
index 00000000..930b81af
--- /dev/null
+++ b/src/wrapped/generated/wrappedcrashhandlerdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedcrashhandlerDEFS_H_
+#define __wrappedcrashhandlerDEFS_H_
+
+
+#endif // __wrappedcrashhandlerDEFS_H_
diff --git a/src/wrapped/generated/wrappedcrashhandlertypes.h b/src/wrapped/generated/wrappedcrashhandlertypes.h
new file mode 100644
index 00000000..1d90f33c
--- /dev/null
+++ b/src/wrapped/generated/wrappedcrashhandlertypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedcrashhandlerTYPES_H_
+#define __wrappedcrashhandlerTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedcrashhandlerTYPES_H_
diff --git a/src/wrapped/generated/wrappedcrashhandlerundefs.h b/src/wrapped/generated/wrappedcrashhandlerundefs.h
new file mode 100644
index 00000000..1a2d9cf1
--- /dev/null
+++ b/src/wrapped/generated/wrappedcrashhandlerundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedcrashhandlerUNDEFS_H_
+#define __wrappedcrashhandlerUNDEFS_H_
+
+
+#endif // __wrappedcrashhandlerUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedcryptodefs.h b/src/wrapped/generated/wrappedcryptodefs.h
new file mode 100644
index 00000000..93575781
--- /dev/null
+++ b/src/wrapped/generated/wrappedcryptodefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedcryptoDEFS_H_
+#define __wrappedcryptoDEFS_H_
+
+
+#endif // __wrappedcryptoDEFS_H_
diff --git a/src/wrapped/generated/wrappedcryptoundefs.h b/src/wrapped/generated/wrappedcryptoundefs.h
new file mode 100644
index 00000000..8387a8f1
--- /dev/null
+++ b/src/wrapped/generated/wrappedcryptoundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedcryptoUNDEFS_H_
+#define __wrappedcryptoUNDEFS_H_
+
+
+#endif // __wrappedcryptoUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedcurldefs.h b/src/wrapped/generated/wrappedcurldefs.h
new file mode 100644
index 00000000..e05c68d7
--- /dev/null
+++ b/src/wrapped/generated/wrappedcurldefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedcurlDEFS_H_
+#define __wrappedcurlDEFS_H_
+
+
+#endif // __wrappedcurlDEFS_H_
diff --git a/src/wrapped/generated/wrappedcurlundefs.h b/src/wrapped/generated/wrappedcurlundefs.h
new file mode 100644
index 00000000..8326f472
--- /dev/null
+++ b/src/wrapped/generated/wrappedcurlundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedcurlUNDEFS_H_
+#define __wrappedcurlUNDEFS_H_
+
+
+#endif // __wrappedcurlUNDEFS_H_
diff --git a/src/wrapped/generated/wrappeddbusdefs.h b/src/wrapped/generated/wrappeddbusdefs.h
new file mode 100644
index 00000000..87af70e0
--- /dev/null
+++ b/src/wrapped/generated/wrappeddbusdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappeddbusDEFS_H_
+#define __wrappeddbusDEFS_H_
+
+
+#endif // __wrappeddbusDEFS_H_
diff --git a/src/wrapped/generated/wrappeddbusundefs.h b/src/wrapped/generated/wrappeddbusundefs.h
new file mode 100644
index 00000000..8ecbe5ca
--- /dev/null
+++ b/src/wrapped/generated/wrappeddbusundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappeddbusUNDEFS_H_
+#define __wrappeddbusUNDEFS_H_
+
+
+#endif // __wrappeddbusUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedexpatdefs.h b/src/wrapped/generated/wrappedexpatdefs.h
new file mode 100644
index 00000000..c1e3ffab
--- /dev/null
+++ b/src/wrapped/generated/wrappedexpatdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedexpatDEFS_H_
+#define __wrappedexpatDEFS_H_
+
+
+#endif // __wrappedexpatDEFS_H_
diff --git a/src/wrapped/generated/wrappedexpatundefs.h b/src/wrapped/generated/wrappedexpatundefs.h
new file mode 100644
index 00000000..04b990a9
--- /dev/null
+++ b/src/wrapped/generated/wrappedexpatundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedexpatUNDEFS_H_
+#define __wrappedexpatUNDEFS_H_
+
+
+#endif // __wrappedexpatUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedflacdefs.h b/src/wrapped/generated/wrappedflacdefs.h
new file mode 100644
index 00000000..c442ef16
--- /dev/null
+++ b/src/wrapped/generated/wrappedflacdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedflacDEFS_H_
+#define __wrappedflacDEFS_H_
+
+
+#endif // __wrappedflacDEFS_H_
diff --git a/src/wrapped/generated/wrappedflacundefs.h b/src/wrapped/generated/wrappedflacundefs.h
new file mode 100644
index 00000000..fb3ac181
--- /dev/null
+++ b/src/wrapped/generated/wrappedflacundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedflacUNDEFS_H_
+#define __wrappedflacUNDEFS_H_
+
+
+#endif // __wrappedflacUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedfontconfigdefs.h b/src/wrapped/generated/wrappedfontconfigdefs.h
new file mode 100644
index 00000000..f4d8b355
--- /dev/null
+++ b/src/wrapped/generated/wrappedfontconfigdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedfontconfigDEFS_H_
+#define __wrappedfontconfigDEFS_H_
+
+
+#endif // __wrappedfontconfigDEFS_H_
diff --git a/src/wrapped/generated/wrappedfontconfigtypes.h b/src/wrapped/generated/wrappedfontconfigtypes.h
new file mode 100644
index 00000000..0c55c953
--- /dev/null
+++ b/src/wrapped/generated/wrappedfontconfigtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedfontconfigTYPES_H_
+#define __wrappedfontconfigTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedfontconfigTYPES_H_
diff --git a/src/wrapped/generated/wrappedfontconfigundefs.h b/src/wrapped/generated/wrappedfontconfigundefs.h
new file mode 100644
index 00000000..d4a9a1e8
--- /dev/null
+++ b/src/wrapped/generated/wrappedfontconfigundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedfontconfigUNDEFS_H_
+#define __wrappedfontconfigUNDEFS_H_
+
+
+#endif // __wrappedfontconfigUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedfreetypedefs.h b/src/wrapped/generated/wrappedfreetypedefs.h
new file mode 100644
index 00000000..951711e6
--- /dev/null
+++ b/src/wrapped/generated/wrappedfreetypedefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedfreetypeDEFS_H_
+#define __wrappedfreetypeDEFS_H_
+
+
+#endif // __wrappedfreetypeDEFS_H_
diff --git a/src/wrapped/generated/wrappedfreetypeundefs.h b/src/wrapped/generated/wrappedfreetypeundefs.h
new file mode 100644
index 00000000..f3e0ce0a
--- /dev/null
+++ b/src/wrapped/generated/wrappedfreetypeundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedfreetypeUNDEFS_H_
+#define __wrappedfreetypeUNDEFS_H_
+
+
+#endif // __wrappedfreetypeUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedgnutlsdefs.h b/src/wrapped/generated/wrappedgnutlsdefs.h
new file mode 100644
index 00000000..39cffc0d
--- /dev/null
+++ b/src/wrapped/generated/wrappedgnutlsdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedgnutlsDEFS_H_
+#define __wrappedgnutlsDEFS_H_
+
+
+#endif // __wrappedgnutlsDEFS_H_
diff --git a/src/wrapped/generated/wrappedgnutlsundefs.h b/src/wrapped/generated/wrappedgnutlsundefs.h
new file mode 100644
index 00000000..5abda75d
--- /dev/null
+++ b/src/wrapped/generated/wrappedgnutlsundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedgnutlsUNDEFS_H_
+#define __wrappedgnutlsUNDEFS_H_
+
+
+#endif // __wrappedgnutlsUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedgssapikrb5defs.h b/src/wrapped/generated/wrappedgssapikrb5defs.h
new file mode 100644
index 00000000..c9b9ccb0
--- /dev/null
+++ b/src/wrapped/generated/wrappedgssapikrb5defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedgssapikrb5DEFS_H_
+#define __wrappedgssapikrb5DEFS_H_
+
+
+#endif // __wrappedgssapikrb5DEFS_H_
diff --git a/src/wrapped/generated/wrappedgssapikrb5types.h b/src/wrapped/generated/wrappedgssapikrb5types.h
new file mode 100644
index 00000000..f3398b97
--- /dev/null
+++ b/src/wrapped/generated/wrappedgssapikrb5types.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedgssapikrb5TYPES_H_
+#define __wrappedgssapikrb5TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedgssapikrb5TYPES_H_
diff --git a/src/wrapped/generated/wrappedgssapikrb5undefs.h b/src/wrapped/generated/wrappedgssapikrb5undefs.h
new file mode 100644
index 00000000..6521effb
--- /dev/null
+++ b/src/wrapped/generated/wrappedgssapikrb5undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedgssapikrb5UNDEFS_H_
+#define __wrappedgssapikrb5UNDEFS_H_
+
+
+#endif // __wrappedgssapikrb5UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedkrb5defs.h b/src/wrapped/generated/wrappedkrb5defs.h
new file mode 100644
index 00000000..4a6e184a
--- /dev/null
+++ b/src/wrapped/generated/wrappedkrb5defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedkrb5DEFS_H_
+#define __wrappedkrb5DEFS_H_
+
+
+#endif // __wrappedkrb5DEFS_H_
diff --git a/src/wrapped/generated/wrappedkrb5undefs.h b/src/wrapped/generated/wrappedkrb5undefs.h
new file mode 100644
index 00000000..e7cf38e8
--- /dev/null
+++ b/src/wrapped/generated/wrappedkrb5undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedkrb5UNDEFS_H_
+#define __wrappedkrb5UNDEFS_H_
+
+
+#endif // __wrappedkrb5UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedldlinuxdefs.h b/src/wrapped/generated/wrappedldlinuxdefs.h
new file mode 100644
index 00000000..0213ef11
--- /dev/null
+++ b/src/wrapped/generated/wrappedldlinuxdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedldlinuxDEFS_H_
+#define __wrappedldlinuxDEFS_H_
+
+
+#endif // __wrappedldlinuxDEFS_H_
diff --git a/src/wrapped/generated/wrappedldlinuxundefs.h b/src/wrapped/generated/wrappedldlinuxundefs.h
new file mode 100644
index 00000000..18704564
--- /dev/null
+++ b/src/wrapped/generated/wrappedldlinuxundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedldlinuxUNDEFS_H_
+#define __wrappedldlinuxUNDEFS_H_
+
+
+#endif // __wrappedldlinuxUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibasounddefs.h b/src/wrapped/generated/wrappedlibasounddefs.h
new file mode 100644
index 00000000..b896d721
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibasounddefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibasoundDEFS_H_
+#define __wrappedlibasoundDEFS_H_
+
+
+#endif // __wrappedlibasoundDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibasoundundefs.h b/src/wrapped/generated/wrappedlibasoundundefs.h
new file mode 100644
index 00000000..3231e9eb
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibasoundundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibasoundUNDEFS_H_
+#define __wrappedlibasoundUNDEFS_H_
+
+
+#endif // __wrappedlibasoundUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibcdefs.h b/src/wrapped/generated/wrappedlibcdefs.h
new file mode 100644
index 00000000..02dca1ee
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibcdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibcDEFS_H_
+#define __wrappedlibcDEFS_H_
+
+
+#endif // __wrappedlibcDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibcryptdefs.h b/src/wrapped/generated/wrappedlibcryptdefs.h
new file mode 100644
index 00000000..c5122190
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibcryptdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibcryptDEFS_H_
+#define __wrappedlibcryptDEFS_H_
+
+
+#endif // __wrappedlibcryptDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibcrypttypes.h b/src/wrapped/generated/wrappedlibcrypttypes.h
new file mode 100644
index 00000000..90694837
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibcrypttypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibcryptTYPES_H_
+#define __wrappedlibcryptTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibcryptTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibcryptundefs.h b/src/wrapped/generated/wrappedlibcryptundefs.h
new file mode 100644
index 00000000..33fc2be3
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibcryptundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibcryptUNDEFS_H_
+#define __wrappedlibcryptUNDEFS_H_
+
+
+#endif // __wrappedlibcryptUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibcundefs.h b/src/wrapped/generated/wrappedlibcundefs.h
new file mode 100644
index 00000000..214aa4e9
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibcundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibcUNDEFS_H_
+#define __wrappedlibcUNDEFS_H_
+
+
+#endif // __wrappedlibcUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibcupsdefs.h b/src/wrapped/generated/wrappedlibcupsdefs.h
new file mode 100644
index 00000000..5f509555
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibcupsdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibcupsDEFS_H_
+#define __wrappedlibcupsDEFS_H_
+
+
+#endif // __wrappedlibcupsDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibcupstypes.h b/src/wrapped/generated/wrappedlibcupstypes.h
new file mode 100644
index 00000000..c3d7cf41
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibcupstypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibcupsTYPES_H_
+#define __wrappedlibcupsTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibcupsTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibcupsundefs.h b/src/wrapped/generated/wrappedlibcupsundefs.h
new file mode 100644
index 00000000..6dd85524
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibcupsundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibcupsUNDEFS_H_
+#define __wrappedlibcupsUNDEFS_H_
+
+
+#endif // __wrappedlibcupsUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibdldefs.h b/src/wrapped/generated/wrappedlibdldefs.h
new file mode 100644
index 00000000..da2dd941
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibdldefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibdlDEFS_H_
+#define __wrappedlibdlDEFS_H_
+
+
+#endif // __wrappedlibdlDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibdlundefs.h b/src/wrapped/generated/wrappedlibdlundefs.h
new file mode 100644
index 00000000..900f7acb
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibdlundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibdlUNDEFS_H_
+#define __wrappedlibdlUNDEFS_H_
+
+
+#endif // __wrappedlibdlUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibformdefs.h b/src/wrapped/generated/wrappedlibformdefs.h
new file mode 100644
index 00000000..ddf3324a
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibformdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibformDEFS_H_
+#define __wrappedlibformDEFS_H_
+
+
+#endif // __wrappedlibformDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibformtypes.h b/src/wrapped/generated/wrappedlibformtypes.h
new file mode 100644
index 00000000..68127d54
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibformtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibformTYPES_H_
+#define __wrappedlibformTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibformTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibformundefs.h b/src/wrapped/generated/wrappedlibformundefs.h
new file mode 100644
index 00000000..74dd3c25
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibformundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibformUNDEFS_H_
+#define __wrappedlibformUNDEFS_H_
+
+
+#endif // __wrappedlibformUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibformwdefs.h b/src/wrapped/generated/wrappedlibformwdefs.h
new file mode 100644
index 00000000..a1cb5780
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibformwdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibformwDEFS_H_
+#define __wrappedlibformwDEFS_H_
+
+
+#endif // __wrappedlibformwDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibformwtypes.h b/src/wrapped/generated/wrappedlibformwtypes.h
new file mode 100644
index 00000000..984fc095
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibformwtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibformwTYPES_H_
+#define __wrappedlibformwTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibformwTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibformwundefs.h b/src/wrapped/generated/wrappedlibformwundefs.h
new file mode 100644
index 00000000..083ad758
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibformwundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibformwUNDEFS_H_
+#define __wrappedlibformwUNDEFS_H_
+
+
+#endif // __wrappedlibformwUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibgldefs.h b/src/wrapped/generated/wrappedlibgldefs.h
new file mode 100644
index 00000000..86e321bb
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibgldefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibglDEFS_H_
+#define __wrappedlibglDEFS_H_
+
+
+#endif // __wrappedlibglDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibgludefs.h b/src/wrapped/generated/wrappedlibgludefs.h
new file mode 100644
index 00000000..5208b734
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibgludefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibgluDEFS_H_
+#define __wrappedlibgluDEFS_H_
+
+
+#endif // __wrappedlibgluDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibglundefs.h b/src/wrapped/generated/wrappedlibglundefs.h
new file mode 100644
index 00000000..eca187de
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibglundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibglUNDEFS_H_
+#define __wrappedlibglUNDEFS_H_
+
+
+#endif // __wrappedlibglUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibgluundefs.h b/src/wrapped/generated/wrappedlibgluundefs.h
new file mode 100644
index 00000000..e8cd91ef
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibgluundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibgluUNDEFS_H_
+#define __wrappedlibgluUNDEFS_H_
+
+
+#endif // __wrappedlibgluUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibicedefs.h b/src/wrapped/generated/wrappedlibicedefs.h
new file mode 100644
index 00000000..122dad44
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibicedefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibiceDEFS_H_
+#define __wrappedlibiceDEFS_H_
+
+
+#endif // __wrappedlibiceDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibicetypes.h b/src/wrapped/generated/wrappedlibicetypes.h
new file mode 100644
index 00000000..ec682022
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibicetypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibiceTYPES_H_
+#define __wrappedlibiceTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibiceTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibiceundefs.h b/src/wrapped/generated/wrappedlibiceundefs.h
new file mode 100644
index 00000000..c0da9c7a
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibiceundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibiceUNDEFS_H_
+#define __wrappedlibiceUNDEFS_H_
+
+
+#endif // __wrappedlibiceUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibmdefs.h b/src/wrapped/generated/wrappedlibmdefs.h
new file mode 100644
index 00000000..91acc570
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibmdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibmDEFS_H_
+#define __wrappedlibmDEFS_H_
+
+
+#endif // __wrappedlibmDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibmundefs.h b/src/wrapped/generated/wrappedlibmundefs.h
new file mode 100644
index 00000000..2728d583
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibmundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibmUNDEFS_H_
+#define __wrappedlibmUNDEFS_H_
+
+
+#endif // __wrappedlibmUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibncurses6defs.h b/src/wrapped/generated/wrappedlibncurses6defs.h
new file mode 100644
index 00000000..3567a1d2
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibncurses6defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibncurses6DEFS_H_
+#define __wrappedlibncurses6DEFS_H_
+
+
+#endif // __wrappedlibncurses6DEFS_H_
diff --git a/src/wrapped/generated/wrappedlibncurses6undefs.h b/src/wrapped/generated/wrappedlibncurses6undefs.h
new file mode 100644
index 00000000..3e17ac29
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibncurses6undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibncurses6UNDEFS_H_
+#define __wrappedlibncurses6UNDEFS_H_
+
+
+#endif // __wrappedlibncurses6UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibncursesdefs.h b/src/wrapped/generated/wrappedlibncursesdefs.h
new file mode 100644
index 00000000..c71f7a92
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibncursesdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibncursesDEFS_H_
+#define __wrappedlibncursesDEFS_H_
+
+
+#endif // __wrappedlibncursesDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibncursesundefs.h b/src/wrapped/generated/wrappedlibncursesundefs.h
new file mode 100644
index 00000000..89e9b60d
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibncursesundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibncursesUNDEFS_H_
+#define __wrappedlibncursesUNDEFS_H_
+
+
+#endif // __wrappedlibncursesUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibncurseswdefs.h b/src/wrapped/generated/wrappedlibncurseswdefs.h
new file mode 100644
index 00000000..003117ac
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibncurseswdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibncurseswDEFS_H_
+#define __wrappedlibncurseswDEFS_H_
+
+
+#endif // __wrappedlibncurseswDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibncurseswundefs.h b/src/wrapped/generated/wrappedlibncurseswundefs.h
new file mode 100644
index 00000000..11202d58
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibncurseswundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibncurseswUNDEFS_H_
+#define __wrappedlibncurseswUNDEFS_H_
+
+
+#endif // __wrappedlibncurseswUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedliboggdefs.h b/src/wrapped/generated/wrappedliboggdefs.h
new file mode 100644
index 00000000..193a9de2
--- /dev/null
+++ b/src/wrapped/generated/wrappedliboggdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedliboggDEFS_H_
+#define __wrappedliboggDEFS_H_
+
+
+#endif // __wrappedliboggDEFS_H_
diff --git a/src/wrapped/generated/wrappedliboggtypes.h b/src/wrapped/generated/wrappedliboggtypes.h
new file mode 100644
index 00000000..182e28b1
--- /dev/null
+++ b/src/wrapped/generated/wrappedliboggtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedliboggTYPES_H_
+#define __wrappedliboggTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedliboggTYPES_H_
diff --git a/src/wrapped/generated/wrappedliboggundefs.h b/src/wrapped/generated/wrappedliboggundefs.h
new file mode 100644
index 00000000..16e9f665
--- /dev/null
+++ b/src/wrapped/generated/wrappedliboggundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedliboggUNDEFS_H_
+#define __wrappedliboggUNDEFS_H_
+
+
+#endif // __wrappedliboggUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibpaneldefs.h b/src/wrapped/generated/wrappedlibpaneldefs.h
new file mode 100644
index 00000000..cd01f102
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibpaneldefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibpanelDEFS_H_
+#define __wrappedlibpanelDEFS_H_
+
+
+#endif // __wrappedlibpanelDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibpaneltypes.h b/src/wrapped/generated/wrappedlibpaneltypes.h
new file mode 100644
index 00000000..d2a41655
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibpaneltypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibpanelTYPES_H_
+#define __wrappedlibpanelTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibpanelTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibpanelundefs.h b/src/wrapped/generated/wrappedlibpanelundefs.h
new file mode 100644
index 00000000..57bb61b7
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibpanelundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibpanelUNDEFS_H_
+#define __wrappedlibpanelUNDEFS_H_
+
+
+#endif // __wrappedlibpanelUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibpcredefs.h b/src/wrapped/generated/wrappedlibpcredefs.h
new file mode 100644
index 00000000..f5fd32f6
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibpcredefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibpcreDEFS_H_
+#define __wrappedlibpcreDEFS_H_
+
+
+#endif // __wrappedlibpcreDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibpcretypes.h b/src/wrapped/generated/wrappedlibpcretypes.h
new file mode 100644
index 00000000..c18506ea
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibpcretypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibpcreTYPES_H_
+#define __wrappedlibpcreTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibpcreTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibpcreundefs.h b/src/wrapped/generated/wrappedlibpcreundefs.h
new file mode 100644
index 00000000..41104d10
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibpcreundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibpcreUNDEFS_H_
+#define __wrappedlibpcreUNDEFS_H_
+
+
+#endif // __wrappedlibpcreUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibpthreaddefs.h b/src/wrapped/generated/wrappedlibpthreaddefs.h
new file mode 100644
index 00000000..827d8e4e
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibpthreaddefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibpthreadDEFS_H_
+#define __wrappedlibpthreadDEFS_H_
+
+
+#endif // __wrappedlibpthreadDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibpthreadundefs.h b/src/wrapped/generated/wrappedlibpthreadundefs.h
new file mode 100644
index 00000000..85829862
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibpthreadundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibpthreadUNDEFS_H_
+#define __wrappedlibpthreadUNDEFS_H_
+
+
+#endif // __wrappedlibpthreadUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibresolvdefs.h b/src/wrapped/generated/wrappedlibresolvdefs.h
new file mode 100644
index 00000000..6e8960df
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibresolvdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibresolvDEFS_H_
+#define __wrappedlibresolvDEFS_H_
+
+
+#endif // __wrappedlibresolvDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibresolvtypes.h b/src/wrapped/generated/wrappedlibresolvtypes.h
new file mode 100644
index 00000000..b2296cec
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibresolvtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibresolvTYPES_H_
+#define __wrappedlibresolvTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibresolvTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibresolvundefs.h b/src/wrapped/generated/wrappedlibresolvundefs.h
new file mode 100644
index 00000000..b2c4ac55
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibresolvundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibresolvUNDEFS_H_
+#define __wrappedlibresolvUNDEFS_H_
+
+
+#endif // __wrappedlibresolvUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibrtdefs.h b/src/wrapped/generated/wrappedlibrtdefs.h
new file mode 100644
index 00000000..fd34d2a9
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibrtdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibrtDEFS_H_
+#define __wrappedlibrtDEFS_H_
+
+
+#endif // __wrappedlibrtDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibrtundefs.h b/src/wrapped/generated/wrappedlibrtundefs.h
new file mode 100644
index 00000000..88133be9
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibrtundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibrtUNDEFS_H_
+#define __wrappedlibrtUNDEFS_H_
+
+
+#endif // __wrappedlibrtUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibsmdefs.h b/src/wrapped/generated/wrappedlibsmdefs.h
new file mode 100644
index 00000000..72015b4d
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibsmdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibsmDEFS_H_
+#define __wrappedlibsmDEFS_H_
+
+
+#endif // __wrappedlibsmDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibsmundefs.h b/src/wrapped/generated/wrappedlibsmundefs.h
new file mode 100644
index 00000000..5a2b2550
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibsmundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibsmUNDEFS_H_
+#define __wrappedlibsmUNDEFS_H_
+
+
+#endif // __wrappedlibsmUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibssldefs.h b/src/wrapped/generated/wrappedlibssldefs.h
new file mode 100644
index 00000000..da44af7b
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibssldefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibsslDEFS_H_
+#define __wrappedlibsslDEFS_H_
+
+
+#endif // __wrappedlibsslDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibsslundefs.h b/src/wrapped/generated/wrappedlibsslundefs.h
new file mode 100644
index 00000000..194fa55c
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibsslundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibsslUNDEFS_H_
+#define __wrappedlibsslUNDEFS_H_
+
+
+#endif // __wrappedlibsslUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibtinfo6defs.h b/src/wrapped/generated/wrappedlibtinfo6defs.h
new file mode 100644
index 00000000..cadbc89a
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibtinfo6defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibtinfo6DEFS_H_
+#define __wrappedlibtinfo6DEFS_H_
+
+
+#endif // __wrappedlibtinfo6DEFS_H_
diff --git a/src/wrapped/generated/wrappedlibtinfo6undefs.h b/src/wrapped/generated/wrappedlibtinfo6undefs.h
new file mode 100644
index 00000000..8051575e
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibtinfo6undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibtinfo6UNDEFS_H_
+#define __wrappedlibtinfo6UNDEFS_H_
+
+
+#endif // __wrappedlibtinfo6UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibtinfodefs.h b/src/wrapped/generated/wrappedlibtinfodefs.h
new file mode 100644
index 00000000..4f856ce3
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibtinfodefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibtinfoDEFS_H_
+#define __wrappedlibtinfoDEFS_H_
+
+
+#endif // __wrappedlibtinfoDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibtinfoundefs.h b/src/wrapped/generated/wrappedlibtinfoundefs.h
new file mode 100644
index 00000000..a4750e30
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibtinfoundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibtinfoUNDEFS_H_
+#define __wrappedlibtinfoUNDEFS_H_
+
+
+#endif // __wrappedlibtinfoUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibuuiddefs.h b/src/wrapped/generated/wrappedlibuuiddefs.h
new file mode 100644
index 00000000..cad40e59
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibuuiddefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibuuidDEFS_H_
+#define __wrappedlibuuidDEFS_H_
+
+
+#endif // __wrappedlibuuidDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibuuidtypes.h b/src/wrapped/generated/wrappedlibuuidtypes.h
new file mode 100644
index 00000000..ac185ff8
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibuuidtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibuuidTYPES_H_
+#define __wrappedlibuuidTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibuuidTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibuuidundefs.h b/src/wrapped/generated/wrappedlibuuidundefs.h
new file mode 100644
index 00000000..3c18e970
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibuuidundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibuuidUNDEFS_H_
+#define __wrappedlibuuidUNDEFS_H_
+
+
+#endif // __wrappedlibuuidUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibvorbisdefs.h b/src/wrapped/generated/wrappedlibvorbisdefs.h
new file mode 100644
index 00000000..9d1c7f63
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibvorbisdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibvorbisDEFS_H_
+#define __wrappedlibvorbisDEFS_H_
+
+
+#endif // __wrappedlibvorbisDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibvorbistypes.h b/src/wrapped/generated/wrappedlibvorbistypes.h
new file mode 100644
index 00000000..2b47eccd
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibvorbistypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibvorbisTYPES_H_
+#define __wrappedlibvorbisTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibvorbisTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibvorbisundefs.h b/src/wrapped/generated/wrappedlibvorbisundefs.h
new file mode 100644
index 00000000..044e934a
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibvorbisundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibvorbisUNDEFS_H_
+#define __wrappedlibvorbisUNDEFS_H_
+
+
+#endif // __wrappedlibvorbisUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibx11defs.h b/src/wrapped/generated/wrappedlibx11defs.h
new file mode 100644
index 00000000..646a415d
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibx11defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibx11DEFS_H_
+#define __wrappedlibx11DEFS_H_
+
+
+#endif // __wrappedlibx11DEFS_H_
diff --git a/src/wrapped/generated/wrappedlibx11undefs.h b/src/wrapped/generated/wrappedlibx11undefs.h
new file mode 100644
index 00000000..f76c41b2
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibx11undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibx11UNDEFS_H_
+#define __wrappedlibx11UNDEFS_H_
+
+
+#endif // __wrappedlibx11UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibx11xcbdefs.h b/src/wrapped/generated/wrappedlibx11xcbdefs.h
new file mode 100644
index 00000000..2375a138
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibx11xcbdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibx11xcbDEFS_H_
+#define __wrappedlibx11xcbDEFS_H_
+
+
+#endif // __wrappedlibx11xcbDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibx11xcbtypes.h b/src/wrapped/generated/wrappedlibx11xcbtypes.h
new file mode 100644
index 00000000..5589a65c
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibx11xcbtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibx11xcbTYPES_H_
+#define __wrappedlibx11xcbTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibx11xcbTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibx11xcbundefs.h b/src/wrapped/generated/wrappedlibx11xcbundefs.h
new file mode 100644
index 00000000..8faee551
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibx11xcbundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibx11xcbUNDEFS_H_
+#define __wrappedlibx11xcbUNDEFS_H_
+
+
+#endif // __wrappedlibx11xcbUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxaudefs.h b/src/wrapped/generated/wrappedlibxaudefs.h
new file mode 100644
index 00000000..dcc84084
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxaudefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxauDEFS_H_
+#define __wrappedlibxauDEFS_H_
+
+
+#endif // __wrappedlibxauDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxautypes.h b/src/wrapped/generated/wrappedlibxautypes.h
new file mode 100644
index 00000000..6f304904
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxautypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxauTYPES_H_
+#define __wrappedlibxauTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxauTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxauundefs.h b/src/wrapped/generated/wrappedlibxauundefs.h
new file mode 100644
index 00000000..f47414c3
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxauundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxauUNDEFS_H_
+#define __wrappedlibxauUNDEFS_H_
+
+
+#endif // __wrappedlibxauUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbdefs.h b/src/wrapped/generated/wrappedlibxcbdefs.h
new file mode 100644
index 00000000..08f8263f
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbDEFS_H_
+#define __wrappedlibxcbDEFS_H_
+
+
+#endif // __wrappedlibxcbDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbglxdefs.h b/src/wrapped/generated/wrappedlibxcbglxdefs.h
new file mode 100644
index 00000000..8d94ed82
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbglxdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbglxDEFS_H_
+#define __wrappedlibxcbglxDEFS_H_
+
+
+#endif // __wrappedlibxcbglxDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbglxtypes.h b/src/wrapped/generated/wrappedlibxcbglxtypes.h
new file mode 100644
index 00000000..6e042cbd
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbglxtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbglxTYPES_H_
+#define __wrappedlibxcbglxTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcbglxTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxcbglxundefs.h b/src/wrapped/generated/wrappedlibxcbglxundefs.h
new file mode 100644
index 00000000..e69fee7e
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbglxundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbglxUNDEFS_H_
+#define __wrappedlibxcbglxUNDEFS_H_
+
+
+#endif // __wrappedlibxcbglxUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbimagedefs.h b/src/wrapped/generated/wrappedlibxcbimagedefs.h
new file mode 100644
index 00000000..a478b646
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbimagedefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbimageDEFS_H_
+#define __wrappedlibxcbimageDEFS_H_
+
+
+#endif // __wrappedlibxcbimageDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbimagetypes.h b/src/wrapped/generated/wrappedlibxcbimagetypes.h
new file mode 100644
index 00000000..14c0fe96
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbimagetypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbimageTYPES_H_
+#define __wrappedlibxcbimageTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcbimageTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxcbimageundefs.h b/src/wrapped/generated/wrappedlibxcbimageundefs.h
new file mode 100644
index 00000000..215ce1f0
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbimageundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbimageUNDEFS_H_
+#define __wrappedlibxcbimageUNDEFS_H_
+
+
+#endif // __wrappedlibxcbimageUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbkeysymsdefs.h b/src/wrapped/generated/wrappedlibxcbkeysymsdefs.h
new file mode 100644
index 00000000..ae6b4e22
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbkeysymsdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbkeysymsDEFS_H_
+#define __wrappedlibxcbkeysymsDEFS_H_
+
+
+#endif // __wrappedlibxcbkeysymsDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbkeysymstypes.h b/src/wrapped/generated/wrappedlibxcbkeysymstypes.h
new file mode 100644
index 00000000..dff07346
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbkeysymstypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbkeysymsTYPES_H_
+#define __wrappedlibxcbkeysymsTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcbkeysymsTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxcbkeysymsundefs.h b/src/wrapped/generated/wrappedlibxcbkeysymsundefs.h
new file mode 100644
index 00000000..70479544
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbkeysymsundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbkeysymsUNDEFS_H_
+#define __wrappedlibxcbkeysymsUNDEFS_H_
+
+
+#endif // __wrappedlibxcbkeysymsUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbrandrdefs.h b/src/wrapped/generated/wrappedlibxcbrandrdefs.h
new file mode 100644
index 00000000..11ee9c20
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbrandrdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbrandrDEFS_H_
+#define __wrappedlibxcbrandrDEFS_H_
+
+
+#endif // __wrappedlibxcbrandrDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbrandrtypes.h b/src/wrapped/generated/wrappedlibxcbrandrtypes.h
new file mode 100644
index 00000000..b130096b
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbrandrtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbrandrTYPES_H_
+#define __wrappedlibxcbrandrTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcbrandrTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxcbrandrundefs.h b/src/wrapped/generated/wrappedlibxcbrandrundefs.h
new file mode 100644
index 00000000..f818dabf
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbrandrundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbrandrUNDEFS_H_
+#define __wrappedlibxcbrandrUNDEFS_H_
+
+
+#endif // __wrappedlibxcbrandrUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbshapedefs.h b/src/wrapped/generated/wrappedlibxcbshapedefs.h
new file mode 100644
index 00000000..7b0236c8
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbshapedefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbshapeDEFS_H_
+#define __wrappedlibxcbshapeDEFS_H_
+
+
+#endif // __wrappedlibxcbshapeDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbshapetypes.h b/src/wrapped/generated/wrappedlibxcbshapetypes.h
new file mode 100644
index 00000000..57473955
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbshapetypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbshapeTYPES_H_
+#define __wrappedlibxcbshapeTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcbshapeTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxcbshapeundefs.h b/src/wrapped/generated/wrappedlibxcbshapeundefs.h
new file mode 100644
index 00000000..b074903f
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbshapeundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbshapeUNDEFS_H_
+#define __wrappedlibxcbshapeUNDEFS_H_
+
+
+#endif // __wrappedlibxcbshapeUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbshmdefs.h b/src/wrapped/generated/wrappedlibxcbshmdefs.h
new file mode 100644
index 00000000..9b59b0f9
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbshmdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbshmDEFS_H_
+#define __wrappedlibxcbshmDEFS_H_
+
+
+#endif // __wrappedlibxcbshmDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbshmtypes.h b/src/wrapped/generated/wrappedlibxcbshmtypes.h
new file mode 100644
index 00000000..37dadae6
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbshmtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbshmTYPES_H_
+#define __wrappedlibxcbshmTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcbshmTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxcbshmundefs.h b/src/wrapped/generated/wrappedlibxcbshmundefs.h
new file mode 100644
index 00000000..a34bfe61
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbshmundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbshmUNDEFS_H_
+#define __wrappedlibxcbshmUNDEFS_H_
+
+
+#endif // __wrappedlibxcbshmUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbtypes.h b/src/wrapped/generated/wrappedlibxcbtypes.h
new file mode 100644
index 00000000..6a57ea55
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbTYPES_H_
+#define __wrappedlibxcbTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcbTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxcbundefs.h b/src/wrapped/generated/wrappedlibxcbundefs.h
new file mode 100644
index 00000000..94950e9a
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbUNDEFS_H_
+#define __wrappedlibxcbUNDEFS_H_
+
+
+#endif // __wrappedlibxcbUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbxfixesdefs.h b/src/wrapped/generated/wrappedlibxcbxfixesdefs.h
new file mode 100644
index 00000000..c7f7f99d
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbxfixesdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbxfixesDEFS_H_
+#define __wrappedlibxcbxfixesDEFS_H_
+
+
+#endif // __wrappedlibxcbxfixesDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbxfixestypes.h b/src/wrapped/generated/wrappedlibxcbxfixestypes.h
new file mode 100644
index 00000000..325f67e0
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbxfixestypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbxfixesTYPES_H_
+#define __wrappedlibxcbxfixesTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcbxfixesTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxcbxfixesundefs.h b/src/wrapped/generated/wrappedlibxcbxfixesundefs.h
new file mode 100644
index 00000000..9b9d4a71
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbxfixesundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbxfixesUNDEFS_H_
+#define __wrappedlibxcbxfixesUNDEFS_H_
+
+
+#endif // __wrappedlibxcbxfixesUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbxtestdefs.h b/src/wrapped/generated/wrappedlibxcbxtestdefs.h
new file mode 100644
index 00000000..bbb182de
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbxtestdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbxtestDEFS_H_
+#define __wrappedlibxcbxtestDEFS_H_
+
+
+#endif // __wrappedlibxcbxtestDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcbxtesttypes.h b/src/wrapped/generated/wrappedlibxcbxtesttypes.h
new file mode 100644
index 00000000..1233b4af
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbxtesttypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbxtestTYPES_H_
+#define __wrappedlibxcbxtestTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcbxtestTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxcbxtestundefs.h b/src/wrapped/generated/wrappedlibxcbxtestundefs.h
new file mode 100644
index 00000000..b3180266
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcbxtestundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcbxtestUNDEFS_H_
+#define __wrappedlibxcbxtestUNDEFS_H_
+
+
+#endif // __wrappedlibxcbxtestUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcompositedefs.h b/src/wrapped/generated/wrappedlibxcompositedefs.h
new file mode 100644
index 00000000..05ed6cf2
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcompositedefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcompositeDEFS_H_
+#define __wrappedlibxcompositeDEFS_H_
+
+
+#endif // __wrappedlibxcompositeDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcompositetypes.h b/src/wrapped/generated/wrappedlibxcompositetypes.h
new file mode 100644
index 00000000..78810676
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcompositetypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcompositeTYPES_H_
+#define __wrappedlibxcompositeTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcompositeTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxcompositeundefs.h b/src/wrapped/generated/wrappedlibxcompositeundefs.h
new file mode 100644
index 00000000..305dfb14
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcompositeundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcompositeUNDEFS_H_
+#define __wrappedlibxcompositeUNDEFS_H_
+
+
+#endif // __wrappedlibxcompositeUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcursordefs.h b/src/wrapped/generated/wrappedlibxcursordefs.h
new file mode 100644
index 00000000..5af48768
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcursordefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcursorDEFS_H_
+#define __wrappedlibxcursorDEFS_H_
+
+
+#endif // __wrappedlibxcursorDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxcursortypes.h b/src/wrapped/generated/wrappedlibxcursortypes.h
new file mode 100644
index 00000000..1f12f8c1
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcursortypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcursorTYPES_H_
+#define __wrappedlibxcursorTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxcursorTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxcursorundefs.h b/src/wrapped/generated/wrappedlibxcursorundefs.h
new file mode 100644
index 00000000..975ff549
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxcursorundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxcursorUNDEFS_H_
+#define __wrappedlibxcursorUNDEFS_H_
+
+
+#endif // __wrappedlibxcursorUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxdamagedefs.h b/src/wrapped/generated/wrappedlibxdamagedefs.h
new file mode 100644
index 00000000..aed3c581
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxdamagedefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxdamageDEFS_H_
+#define __wrappedlibxdamageDEFS_H_
+
+
+#endif // __wrappedlibxdamageDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxdamagetypes.h b/src/wrapped/generated/wrappedlibxdamagetypes.h
new file mode 100644
index 00000000..6eea93fa
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxdamagetypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxdamageTYPES_H_
+#define __wrappedlibxdamageTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxdamageTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxdamageundefs.h b/src/wrapped/generated/wrappedlibxdamageundefs.h
new file mode 100644
index 00000000..d66d406d
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxdamageundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxdamageUNDEFS_H_
+#define __wrappedlibxdamageUNDEFS_H_
+
+
+#endif // __wrappedlibxdamageUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxdmcpdefs.h b/src/wrapped/generated/wrappedlibxdmcpdefs.h
new file mode 100644
index 00000000..8d64555d
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxdmcpdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxdmcpDEFS_H_
+#define __wrappedlibxdmcpDEFS_H_
+
+
+#endif // __wrappedlibxdmcpDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxdmcptypes.h b/src/wrapped/generated/wrappedlibxdmcptypes.h
new file mode 100644
index 00000000..95cc535a
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxdmcptypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxdmcpTYPES_H_
+#define __wrappedlibxdmcpTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxdmcpTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxdmcpundefs.h b/src/wrapped/generated/wrappedlibxdmcpundefs.h
new file mode 100644
index 00000000..52b02372
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxdmcpundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxdmcpUNDEFS_H_
+#define __wrappedlibxdmcpUNDEFS_H_
+
+
+#endif // __wrappedlibxdmcpUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxextdefs.h b/src/wrapped/generated/wrappedlibxextdefs.h
new file mode 100644
index 00000000..5fc5e24f
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxextdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxextDEFS_H_
+#define __wrappedlibxextDEFS_H_
+
+
+#endif // __wrappedlibxextDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxextundefs.h b/src/wrapped/generated/wrappedlibxextundefs.h
new file mode 100644
index 00000000..8a0ec5e8
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxextundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxextUNDEFS_H_
+#define __wrappedlibxextUNDEFS_H_
+
+
+#endif // __wrappedlibxextUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxfixesdefs.h b/src/wrapped/generated/wrappedlibxfixesdefs.h
new file mode 100644
index 00000000..cfb4e578
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxfixesdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxfixesDEFS_H_
+#define __wrappedlibxfixesDEFS_H_
+
+
+#endif // __wrappedlibxfixesDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxfixestypes.h b/src/wrapped/generated/wrappedlibxfixestypes.h
new file mode 100644
index 00000000..064803fd
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxfixestypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxfixesTYPES_H_
+#define __wrappedlibxfixesTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxfixesTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxfixesundefs.h b/src/wrapped/generated/wrappedlibxfixesundefs.h
new file mode 100644
index 00000000..c05b33a7
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxfixesundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxfixesUNDEFS_H_
+#define __wrappedlibxfixesUNDEFS_H_
+
+
+#endif // __wrappedlibxfixesUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxftdefs.h b/src/wrapped/generated/wrappedlibxftdefs.h
new file mode 100644
index 00000000..cc1066f5
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxftdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxftDEFS_H_
+#define __wrappedlibxftDEFS_H_
+
+
+#endif // __wrappedlibxftDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxfttypes.h b/src/wrapped/generated/wrappedlibxfttypes.h
new file mode 100644
index 00000000..da752c8d
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxfttypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxftTYPES_H_
+#define __wrappedlibxftTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxftTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxftundefs.h b/src/wrapped/generated/wrappedlibxftundefs.h
new file mode 100644
index 00000000..4e0d4d0a
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxftundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxftUNDEFS_H_
+#define __wrappedlibxftUNDEFS_H_
+
+
+#endif // __wrappedlibxftUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxidefs.h b/src/wrapped/generated/wrappedlibxidefs.h
new file mode 100644
index 00000000..9c21d763
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxidefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxiDEFS_H_
+#define __wrappedlibxiDEFS_H_
+
+
+#endif // __wrappedlibxiDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxitypes.h b/src/wrapped/generated/wrappedlibxitypes.h
new file mode 100644
index 00000000..39907d81
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxitypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxiTYPES_H_
+#define __wrappedlibxiTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxiTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxiundefs.h b/src/wrapped/generated/wrappedlibxiundefs.h
new file mode 100644
index 00000000..84bd3fff
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxiundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxiUNDEFS_H_
+#define __wrappedlibxiUNDEFS_H_
+
+
+#endif // __wrappedlibxiUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxmudefs.h b/src/wrapped/generated/wrappedlibxmudefs.h
new file mode 100644
index 00000000..eaae98d0
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxmudefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxmuDEFS_H_
+#define __wrappedlibxmuDEFS_H_
+
+
+#endif // __wrappedlibxmuDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxmutypes.h b/src/wrapped/generated/wrappedlibxmutypes.h
new file mode 100644
index 00000000..aa2ea079
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxmutypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxmuTYPES_H_
+#define __wrappedlibxmuTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxmuTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxmuundefs.h b/src/wrapped/generated/wrappedlibxmuundefs.h
new file mode 100644
index 00000000..854f60e8
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxmuundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxmuUNDEFS_H_
+#define __wrappedlibxmuUNDEFS_H_
+
+
+#endif // __wrappedlibxmuUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxpmdefs.h b/src/wrapped/generated/wrappedlibxpmdefs.h
new file mode 100644
index 00000000..372b068b
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxpmdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxpmDEFS_H_
+#define __wrappedlibxpmDEFS_H_
+
+
+#endif // __wrappedlibxpmDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxpmtypes.h b/src/wrapped/generated/wrappedlibxpmtypes.h
new file mode 100644
index 00000000..95eb1b7d
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxpmtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxpmTYPES_H_
+#define __wrappedlibxpmTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxpmTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxpmundefs.h b/src/wrapped/generated/wrappedlibxpmundefs.h
new file mode 100644
index 00000000..6551e728
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxpmundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxpmUNDEFS_H_
+#define __wrappedlibxpmUNDEFS_H_
+
+
+#endif // __wrappedlibxpmUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxrandrdefs.h b/src/wrapped/generated/wrappedlibxrandrdefs.h
new file mode 100644
index 00000000..292caa89
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxrandrdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxrandrDEFS_H_
+#define __wrappedlibxrandrDEFS_H_
+
+
+#endif // __wrappedlibxrandrDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxrandrtypes.h b/src/wrapped/generated/wrappedlibxrandrtypes.h
new file mode 100644
index 00000000..3624be0b
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxrandrtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxrandrTYPES_H_
+#define __wrappedlibxrandrTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxrandrTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxrandrundefs.h b/src/wrapped/generated/wrappedlibxrandrundefs.h
new file mode 100644
index 00000000..b1a9713f
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxrandrundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxrandrUNDEFS_H_
+#define __wrappedlibxrandrUNDEFS_H_
+
+
+#endif // __wrappedlibxrandrUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxrenderdefs.h b/src/wrapped/generated/wrappedlibxrenderdefs.h
new file mode 100644
index 00000000..37d544a0
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxrenderdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxrenderDEFS_H_
+#define __wrappedlibxrenderDEFS_H_
+
+
+#endif // __wrappedlibxrenderDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxrendertypes.h b/src/wrapped/generated/wrappedlibxrendertypes.h
new file mode 100644
index 00000000..854c1a66
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxrendertypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxrenderTYPES_H_
+#define __wrappedlibxrenderTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxrenderTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxrenderundefs.h b/src/wrapped/generated/wrappedlibxrenderundefs.h
new file mode 100644
index 00000000..be9cff75
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxrenderundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxrenderUNDEFS_H_
+#define __wrappedlibxrenderUNDEFS_H_
+
+
+#endif // __wrappedlibxrenderUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxssdefs.h b/src/wrapped/generated/wrappedlibxssdefs.h
new file mode 100644
index 00000000..e12efa6c
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxssdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxssDEFS_H_
+#define __wrappedlibxssDEFS_H_
+
+
+#endif // __wrappedlibxssDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxsstypes.h b/src/wrapped/generated/wrappedlibxsstypes.h
new file mode 100644
index 00000000..0a23b357
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxsstypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxssTYPES_H_
+#define __wrappedlibxssTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxssTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxssundefs.h b/src/wrapped/generated/wrappedlibxssundefs.h
new file mode 100644
index 00000000..604eb947
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxssundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxssUNDEFS_H_
+#define __wrappedlibxssUNDEFS_H_
+
+
+#endif // __wrappedlibxssUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxtdefs.h b/src/wrapped/generated/wrappedlibxtdefs.h
new file mode 100644
index 00000000..d5720e6e
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxtdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxtDEFS_H_
+#define __wrappedlibxtDEFS_H_
+
+
+#endif // __wrappedlibxtDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxtstdefs.h b/src/wrapped/generated/wrappedlibxtstdefs.h
new file mode 100644
index 00000000..14f440fa
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxtstdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxtstDEFS_H_
+#define __wrappedlibxtstDEFS_H_
+
+
+#endif // __wrappedlibxtstDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxtstundefs.h b/src/wrapped/generated/wrappedlibxtstundefs.h
new file mode 100644
index 00000000..b453f423
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxtstundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxtstUNDEFS_H_
+#define __wrappedlibxtstUNDEFS_H_
+
+
+#endif // __wrappedlibxtstUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxtundefs.h b/src/wrapped/generated/wrappedlibxtundefs.h
new file mode 100644
index 00000000..ca18058c
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxtundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxtUNDEFS_H_
+#define __wrappedlibxtUNDEFS_H_
+
+
+#endif // __wrappedlibxtUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxxf86vmdefs.h b/src/wrapped/generated/wrappedlibxxf86vmdefs.h
new file mode 100644
index 00000000..ac78258b
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxxf86vmdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxxf86vmDEFS_H_
+#define __wrappedlibxxf86vmDEFS_H_
+
+
+#endif // __wrappedlibxxf86vmDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibxxf86vmtypes.h b/src/wrapped/generated/wrappedlibxxf86vmtypes.h
new file mode 100644
index 00000000..d8ccb12f
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxxf86vmtypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxxf86vmTYPES_H_
+#define __wrappedlibxxf86vmTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedlibxxf86vmTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxxf86vmundefs.h b/src/wrapped/generated/wrappedlibxxf86vmundefs.h
new file mode 100644
index 00000000..a285c1e3
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxxf86vmundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibxxf86vmUNDEFS_H_
+#define __wrappedlibxxf86vmUNDEFS_H_
+
+
+#endif // __wrappedlibxxf86vmUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibzdefs.h b/src/wrapped/generated/wrappedlibzdefs.h
new file mode 100644
index 00000000..0f5fce41
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibzdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibzDEFS_H_
+#define __wrappedlibzDEFS_H_
+
+
+#endif // __wrappedlibzDEFS_H_
diff --git a/src/wrapped/generated/wrappedlibzundefs.h b/src/wrapped/generated/wrappedlibzundefs.h
new file mode 100644
index 00000000..1ccddeb3
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibzundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibzUNDEFS_H_
+#define __wrappedlibzUNDEFS_H_
+
+
+#endif // __wrappedlibzUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedlzmadefs.h b/src/wrapped/generated/wrappedlzmadefs.h
new file mode 100644
index 00000000..9eaa78c9
--- /dev/null
+++ b/src/wrapped/generated/wrappedlzmadefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlzmaDEFS_H_
+#define __wrappedlzmaDEFS_H_
+
+
+#endif // __wrappedlzmaDEFS_H_
diff --git a/src/wrapped/generated/wrappedlzmaundefs.h b/src/wrapped/generated/wrappedlzmaundefs.h
new file mode 100644
index 00000000..8d158abe
--- /dev/null
+++ b/src/wrapped/generated/wrappedlzmaundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlzmaUNDEFS_H_
+#define __wrappedlzmaUNDEFS_H_
+
+
+#endif // __wrappedlzmaUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedmpg123defs.h b/src/wrapped/generated/wrappedmpg123defs.h
new file mode 100644
index 00000000..1b079dc4
--- /dev/null
+++ b/src/wrapped/generated/wrappedmpg123defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedmpg123DEFS_H_
+#define __wrappedmpg123DEFS_H_
+
+
+#endif // __wrappedmpg123DEFS_H_
diff --git a/src/wrapped/generated/wrappedmpg123undefs.h b/src/wrapped/generated/wrappedmpg123undefs.h
new file mode 100644
index 00000000..581b2427
--- /dev/null
+++ b/src/wrapped/generated/wrappedmpg123undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedmpg123UNDEFS_H_
+#define __wrappedmpg123UNDEFS_H_
+
+
+#endif // __wrappedmpg123UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedopenaldefs.h b/src/wrapped/generated/wrappedopenaldefs.h
new file mode 100644
index 00000000..7705b8bf
--- /dev/null
+++ b/src/wrapped/generated/wrappedopenaldefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedopenalDEFS_H_
+#define __wrappedopenalDEFS_H_
+
+
+#endif // __wrappedopenalDEFS_H_
diff --git a/src/wrapped/generated/wrappedopenalundefs.h b/src/wrapped/generated/wrappedopenalundefs.h
new file mode 100644
index 00000000..f25739c2
--- /dev/null
+++ b/src/wrapped/generated/wrappedopenalundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedopenalUNDEFS_H_
+#define __wrappedopenalUNDEFS_H_
+
+
+#endif // __wrappedopenalUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedpangocairodefs.h b/src/wrapped/generated/wrappedpangocairodefs.h
new file mode 100644
index 00000000..80c13177
--- /dev/null
+++ b/src/wrapped/generated/wrappedpangocairodefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpangocairoDEFS_H_
+#define __wrappedpangocairoDEFS_H_
+
+
+#endif // __wrappedpangocairoDEFS_H_
diff --git a/src/wrapped/generated/wrappedpangocairotypes.h b/src/wrapped/generated/wrappedpangocairotypes.h
new file mode 100644
index 00000000..a6989c40
--- /dev/null
+++ b/src/wrapped/generated/wrappedpangocairotypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpangocairoTYPES_H_
+#define __wrappedpangocairoTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedpangocairoTYPES_H_
diff --git a/src/wrapped/generated/wrappedpangocairoundefs.h b/src/wrapped/generated/wrappedpangocairoundefs.h
new file mode 100644
index 00000000..81a96e65
--- /dev/null
+++ b/src/wrapped/generated/wrappedpangocairoundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpangocairoUNDEFS_H_
+#define __wrappedpangocairoUNDEFS_H_
+
+
+#endif // __wrappedpangocairoUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedpangodefs.h b/src/wrapped/generated/wrappedpangodefs.h
new file mode 100644
index 00000000..e39d28f0
--- /dev/null
+++ b/src/wrapped/generated/wrappedpangodefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpangoDEFS_H_
+#define __wrappedpangoDEFS_H_
+
+
+#endif // __wrappedpangoDEFS_H_
diff --git a/src/wrapped/generated/wrappedpangoft2defs.h b/src/wrapped/generated/wrappedpangoft2defs.h
new file mode 100644
index 00000000..f21bb2c5
--- /dev/null
+++ b/src/wrapped/generated/wrappedpangoft2defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpangoft2DEFS_H_
+#define __wrappedpangoft2DEFS_H_
+
+
+#endif // __wrappedpangoft2DEFS_H_
diff --git a/src/wrapped/generated/wrappedpangoft2types.h b/src/wrapped/generated/wrappedpangoft2types.h
new file mode 100644
index 00000000..ad618b1b
--- /dev/null
+++ b/src/wrapped/generated/wrappedpangoft2types.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpangoft2TYPES_H_
+#define __wrappedpangoft2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedpangoft2TYPES_H_
diff --git a/src/wrapped/generated/wrappedpangoft2undefs.h b/src/wrapped/generated/wrappedpangoft2undefs.h
new file mode 100644
index 00000000..a36a4633
--- /dev/null
+++ b/src/wrapped/generated/wrappedpangoft2undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpangoft2UNDEFS_H_
+#define __wrappedpangoft2UNDEFS_H_
+
+
+#endif // __wrappedpangoft2UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedpangoundefs.h b/src/wrapped/generated/wrappedpangoundefs.h
new file mode 100644
index 00000000..82cbb782
--- /dev/null
+++ b/src/wrapped/generated/wrappedpangoundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpangoUNDEFS_H_
+#define __wrappedpangoUNDEFS_H_
+
+
+#endif // __wrappedpangoUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedpng16defs.h b/src/wrapped/generated/wrappedpng16defs.h
new file mode 100644
index 00000000..78362c50
--- /dev/null
+++ b/src/wrapped/generated/wrappedpng16defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpng16DEFS_H_
+#define __wrappedpng16DEFS_H_
+
+
+#endif // __wrappedpng16DEFS_H_
diff --git a/src/wrapped/generated/wrappedpng16undefs.h b/src/wrapped/generated/wrappedpng16undefs.h
new file mode 100644
index 00000000..cc7baad1
--- /dev/null
+++ b/src/wrapped/generated/wrappedpng16undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpng16UNDEFS_H_
+#define __wrappedpng16UNDEFS_H_
+
+
+#endif // __wrappedpng16UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedpulsedefs.h b/src/wrapped/generated/wrappedpulsedefs.h
new file mode 100644
index 00000000..d417e3b6
--- /dev/null
+++ b/src/wrapped/generated/wrappedpulsedefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpulseDEFS_H_
+#define __wrappedpulseDEFS_H_
+
+
+#endif // __wrappedpulseDEFS_H_
diff --git a/src/wrapped/generated/wrappedpulsesimpledefs.h b/src/wrapped/generated/wrappedpulsesimpledefs.h
new file mode 100644
index 00000000..bf1f06a7
--- /dev/null
+++ b/src/wrapped/generated/wrappedpulsesimpledefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpulsesimpleDEFS_H_
+#define __wrappedpulsesimpleDEFS_H_
+
+
+#endif // __wrappedpulsesimpleDEFS_H_
diff --git a/src/wrapped/generated/wrappedpulsesimpletypes.h b/src/wrapped/generated/wrappedpulsesimpletypes.h
new file mode 100644
index 00000000..a2842447
--- /dev/null
+++ b/src/wrapped/generated/wrappedpulsesimpletypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpulsesimpleTYPES_H_
+#define __wrappedpulsesimpleTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedpulsesimpleTYPES_H_
diff --git a/src/wrapped/generated/wrappedpulsesimpleundefs.h b/src/wrapped/generated/wrappedpulsesimpleundefs.h
new file mode 100644
index 00000000..5ba9c893
--- /dev/null
+++ b/src/wrapped/generated/wrappedpulsesimpleundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpulsesimpleUNDEFS_H_
+#define __wrappedpulsesimpleUNDEFS_H_
+
+
+#endif // __wrappedpulsesimpleUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedpulseundefs.h b/src/wrapped/generated/wrappedpulseundefs.h
new file mode 100644
index 00000000..b1fb6a9f
--- /dev/null
+++ b/src/wrapped/generated/wrappedpulseundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedpulseUNDEFS_H_
+#define __wrappedpulseUNDEFS_H_
+
+
+#endif // __wrappedpulseUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1defs.h b/src/wrapped/generated/wrappedsdl1defs.h
new file mode 100644
index 00000000..a2e5f90c
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1DEFS_H_
+#define __wrappedsdl1DEFS_H_
+
+
+#endif // __wrappedsdl1DEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1imagedefs.h b/src/wrapped/generated/wrappedsdl1imagedefs.h
new file mode 100644
index 00000000..164c7ab2
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1imagedefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1imageDEFS_H_
+#define __wrappedsdl1imageDEFS_H_
+
+
+#endif // __wrappedsdl1imageDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1imageundefs.h b/src/wrapped/generated/wrappedsdl1imageundefs.h
new file mode 100644
index 00000000..e4a85aa3
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1imageundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1imageUNDEFS_H_
+#define __wrappedsdl1imageUNDEFS_H_
+
+
+#endif // __wrappedsdl1imageUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1mixerdefs.h b/src/wrapped/generated/wrappedsdl1mixerdefs.h
new file mode 100644
index 00000000..fa4917ae
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1mixerdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1mixerDEFS_H_
+#define __wrappedsdl1mixerDEFS_H_
+
+
+#endif // __wrappedsdl1mixerDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1mixerundefs.h b/src/wrapped/generated/wrappedsdl1mixerundefs.h
new file mode 100644
index 00000000..9d2c51c2
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1mixerundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1mixerUNDEFS_H_
+#define __wrappedsdl1mixerUNDEFS_H_
+
+
+#endif // __wrappedsdl1mixerUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1netdefs.h b/src/wrapped/generated/wrappedsdl1netdefs.h
new file mode 100644
index 00000000..a4995db6
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1netdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1netDEFS_H_
+#define __wrappedsdl1netDEFS_H_
+
+
+#endif // __wrappedsdl1netDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1nettypes.h b/src/wrapped/generated/wrappedsdl1nettypes.h
new file mode 100644
index 00000000..9aaed170
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1nettypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1netTYPES_H_
+#define __wrappedsdl1netTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedsdl1netTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl1netundefs.h b/src/wrapped/generated/wrappedsdl1netundefs.h
new file mode 100644
index 00000000..3eade713
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1netundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1netUNDEFS_H_
+#define __wrappedsdl1netUNDEFS_H_
+
+
+#endif // __wrappedsdl1netUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1sounddefs.h b/src/wrapped/generated/wrappedsdl1sounddefs.h
new file mode 100644
index 00000000..df8c23a0
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1sounddefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1soundDEFS_H_
+#define __wrappedsdl1soundDEFS_H_
+
+
+#endif // __wrappedsdl1soundDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1soundundefs.h b/src/wrapped/generated/wrappedsdl1soundundefs.h
new file mode 100644
index 00000000..a42eae70
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1soundundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1soundUNDEFS_H_
+#define __wrappedsdl1soundUNDEFS_H_
+
+
+#endif // __wrappedsdl1soundUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1ttfdefs.h b/src/wrapped/generated/wrappedsdl1ttfdefs.h
new file mode 100644
index 00000000..6c82a567
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1ttfdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1ttfDEFS_H_
+#define __wrappedsdl1ttfDEFS_H_
+
+
+#endif // __wrappedsdl1ttfDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1ttfundefs.h b/src/wrapped/generated/wrappedsdl1ttfundefs.h
new file mode 100644
index 00000000..32478df7
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1ttfundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1ttfUNDEFS_H_
+#define __wrappedsdl1ttfUNDEFS_H_
+
+
+#endif // __wrappedsdl1ttfUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl1undefs.h b/src/wrapped/generated/wrappedsdl1undefs.h
new file mode 100644
index 00000000..4500242a
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl1UNDEFS_H_
+#define __wrappedsdl1UNDEFS_H_
+
+
+#endif // __wrappedsdl1UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl2defs.h b/src/wrapped/generated/wrappedsdl2defs.h
new file mode 100644
index 00000000..7881a85d
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2defs.h
@@ -0,0 +1,9 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl2DEFS_H_
+#define __wrappedsdl2DEFS_H_
+
+#define vFGppp vFUUppp
+
+#endif // __wrappedsdl2DEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl2imagedefs.h b/src/wrapped/generated/wrappedsdl2imagedefs.h
new file mode 100644
index 00000000..66f53dd4
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2imagedefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl2imageDEFS_H_
+#define __wrappedsdl2imageDEFS_H_
+
+
+#endif // __wrappedsdl2imageDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl2imageundefs.h b/src/wrapped/generated/wrappedsdl2imageundefs.h
new file mode 100644
index 00000000..1191b5b3
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2imageundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl2imageUNDEFS_H_
+#define __wrappedsdl2imageUNDEFS_H_
+
+
+#endif // __wrappedsdl2imageUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl2mixerdefs.h b/src/wrapped/generated/wrappedsdl2mixerdefs.h
new file mode 100644
index 00000000..87747c0c
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2mixerdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl2mixerDEFS_H_
+#define __wrappedsdl2mixerDEFS_H_
+
+
+#endif // __wrappedsdl2mixerDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl2mixerundefs.h b/src/wrapped/generated/wrappedsdl2mixerundefs.h
new file mode 100644
index 00000000..5b1e254d
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2mixerundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl2mixerUNDEFS_H_
+#define __wrappedsdl2mixerUNDEFS_H_
+
+
+#endif // __wrappedsdl2mixerUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl2netdefs.h b/src/wrapped/generated/wrappedsdl2netdefs.h
new file mode 100644
index 00000000..cc22f94f
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2netdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl2netDEFS_H_
+#define __wrappedsdl2netDEFS_H_
+
+
+#endif // __wrappedsdl2netDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl2nettypes.h b/src/wrapped/generated/wrappedsdl2nettypes.h
new file mode 100644
index 00000000..d6a4f2b2
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2nettypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl2netTYPES_H_
+#define __wrappedsdl2netTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedsdl2netTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl2netundefs.h b/src/wrapped/generated/wrappedsdl2netundefs.h
new file mode 100644
index 00000000..4ae246f3
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2netundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl2netUNDEFS_H_
+#define __wrappedsdl2netUNDEFS_H_
+
+
+#endif // __wrappedsdl2netUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl2ttfdefs.h b/src/wrapped/generated/wrappedsdl2ttfdefs.h
new file mode 100644
index 00000000..afefc8e8
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2ttfdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl2ttfDEFS_H_
+#define __wrappedsdl2ttfDEFS_H_
+
+
+#endif // __wrappedsdl2ttfDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl2ttfundefs.h b/src/wrapped/generated/wrappedsdl2ttfundefs.h
new file mode 100644
index 00000000..f22bd7ec
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2ttfundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl2ttfUNDEFS_H_
+#define __wrappedsdl2ttfUNDEFS_H_
+
+
+#endif // __wrappedsdl2ttfUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsdl2types.h b/src/wrapped/generated/wrappedsdl2types.h
index ff9d318e..802dc4f0 100644
--- a/src/wrapped/generated/wrappedsdl2types.h
+++ b/src/wrapped/generated/wrappedsdl2types.h
@@ -40,10 +40,10 @@ typedef void* (*pFupp_t)(uint64_t, void*, void*);
 typedef void* (*pFppi_t)(void*, void*, int64_t);
 typedef void* (*pFppp_t)(void*, void*, void*);
 typedef void (*vFpuup_t)(void*, uint64_t, uint64_t, void*);
+typedef void (*vFGppp_t)(SDL_JoystickGUID, void*, void*, void*);
 typedef int64_t (*iFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef int64_t (*iFpLpV_t)(void*, uintptr_t, void*, ...);
 typedef uint64_t (*uFppuu_t)(void*, void*, uint64_t, uint64_t);
-typedef void (*vFppppp_t)(void*, void*, void*, void*, void*);
 typedef int64_t (*iFpippi_t)(void*, int64_t, void*, void*, int64_t);
 typedef void* (*pFpippp_t)(void*, int64_t, void*, void*, void*);
 
@@ -121,14 +121,12 @@ typedef void* (*pFpippp_t)(void*, int64_t, void*, void*, void*);
 	GO(SDL_LoadFile_RW, pFppi_t) \
 	GO(SDL_CreateThread, pFppp_t) \
 	GO(SDL_qsort, vFpuup_t) \
+	GO(SDL_GetJoystickGUIDInfo, vFGppp_t) \
 	GO(SDL_vsnprintf, iFpLpp_t) \
 	GO(SDL_snprintf, iFpLpV_t) \
 	GO(SDL_RWread, uFppuu_t) \
 	GO(SDL_RWwrite, uFppuu_t) \
-	/*GO(SDL_GetJoystickGUIDInfo, vFppppp_t)*/ \
 	GO(SDL_OpenAudioDevice, iFpippi_t) \
 	GO(SDL_LoadWAV_RW, pFpippp_t)
 
-// TODO: FIXME
-
 #endif // __wrappedsdl2TYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl2undefs.h b/src/wrapped/generated/wrappedsdl2undefs.h
new file mode 100644
index 00000000..1c3c00b9
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2undefs.h
@@ -0,0 +1,9 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsdl2UNDEFS_H_
+#define __wrappedsdl2UNDEFS_H_
+
+#undef vFGppp
+
+#endif // __wrappedsdl2UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsmpeg2defs.h b/src/wrapped/generated/wrappedsmpeg2defs.h
new file mode 100644
index 00000000..3f136c24
--- /dev/null
+++ b/src/wrapped/generated/wrappedsmpeg2defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsmpeg2DEFS_H_
+#define __wrappedsmpeg2DEFS_H_
+
+
+#endif // __wrappedsmpeg2DEFS_H_
diff --git a/src/wrapped/generated/wrappedsmpeg2undefs.h b/src/wrapped/generated/wrappedsmpeg2undefs.h
new file mode 100644
index 00000000..f31ced54
--- /dev/null
+++ b/src/wrapped/generated/wrappedsmpeg2undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsmpeg2UNDEFS_H_
+#define __wrappedsmpeg2UNDEFS_H_
+
+
+#endif // __wrappedsmpeg2UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedsmpegdefs.h b/src/wrapped/generated/wrappedsmpegdefs.h
new file mode 100644
index 00000000..8f89d4ad
--- /dev/null
+++ b/src/wrapped/generated/wrappedsmpegdefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsmpegDEFS_H_
+#define __wrappedsmpegDEFS_H_
+
+
+#endif // __wrappedsmpegDEFS_H_
diff --git a/src/wrapped/generated/wrappedsmpegundefs.h b/src/wrapped/generated/wrappedsmpegundefs.h
new file mode 100644
index 00000000..c4881666
--- /dev/null
+++ b/src/wrapped/generated/wrappedsmpegundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedsmpegUNDEFS_H_
+#define __wrappedsmpegUNDEFS_H_
+
+
+#endif // __wrappedsmpegUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedtcmallocminimaldefs.h b/src/wrapped/generated/wrappedtcmallocminimaldefs.h
new file mode 100644
index 00000000..69d11bfe
--- /dev/null
+++ b/src/wrapped/generated/wrappedtcmallocminimaldefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedtcmallocminimalDEFS_H_
+#define __wrappedtcmallocminimalDEFS_H_
+
+
+#endif // __wrappedtcmallocminimalDEFS_H_
diff --git a/src/wrapped/generated/wrappedtcmallocminimalundefs.h b/src/wrapped/generated/wrappedtcmallocminimalundefs.h
new file mode 100644
index 00000000..4b56d2bc
--- /dev/null
+++ b/src/wrapped/generated/wrappedtcmallocminimalundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedtcmallocminimalUNDEFS_H_
+#define __wrappedtcmallocminimalUNDEFS_H_
+
+
+#endif // __wrappedtcmallocminimalUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedudev0defs.h b/src/wrapped/generated/wrappedudev0defs.h
new file mode 100644
index 00000000..f69a3a9b
--- /dev/null
+++ b/src/wrapped/generated/wrappedudev0defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedudev0DEFS_H_
+#define __wrappedudev0DEFS_H_
+
+
+#endif // __wrappedudev0DEFS_H_
diff --git a/src/wrapped/generated/wrappedudev0undefs.h b/src/wrapped/generated/wrappedudev0undefs.h
new file mode 100644
index 00000000..08dd2e9c
--- /dev/null
+++ b/src/wrapped/generated/wrappedudev0undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedudev0UNDEFS_H_
+#define __wrappedudev0UNDEFS_H_
+
+
+#endif // __wrappedudev0UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedudev1defs.h b/src/wrapped/generated/wrappedudev1defs.h
new file mode 100644
index 00000000..5ba54f22
--- /dev/null
+++ b/src/wrapped/generated/wrappedudev1defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedudev1DEFS_H_
+#define __wrappedudev1DEFS_H_
+
+
+#endif // __wrappedudev1DEFS_H_
diff --git a/src/wrapped/generated/wrappedudev1undefs.h b/src/wrapped/generated/wrappedudev1undefs.h
new file mode 100644
index 00000000..f647ba19
--- /dev/null
+++ b/src/wrapped/generated/wrappedudev1undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedudev1UNDEFS_H_
+#define __wrappedudev1UNDEFS_H_
+
+
+#endif // __wrappedudev1UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedutildefs.h b/src/wrapped/generated/wrappedutildefs.h
new file mode 100644
index 00000000..5ecf22b6
--- /dev/null
+++ b/src/wrapped/generated/wrappedutildefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedutilDEFS_H_
+#define __wrappedutilDEFS_H_
+
+
+#endif // __wrappedutilDEFS_H_
diff --git a/src/wrapped/generated/wrappedutilundefs.h b/src/wrapped/generated/wrappedutilundefs.h
new file mode 100644
index 00000000..11092722
--- /dev/null
+++ b/src/wrapped/generated/wrappedutilundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedutilUNDEFS_H_
+#define __wrappedutilUNDEFS_H_
+
+
+#endif // __wrappedutilUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedvorbisfiledefs.h b/src/wrapped/generated/wrappedvorbisfiledefs.h
new file mode 100644
index 00000000..bfc562cc
--- /dev/null
+++ b/src/wrapped/generated/wrappedvorbisfiledefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedvorbisfileDEFS_H_
+#define __wrappedvorbisfileDEFS_H_
+
+
+#endif // __wrappedvorbisfileDEFS_H_
diff --git a/src/wrapped/generated/wrappedvorbisfileundefs.h b/src/wrapped/generated/wrappedvorbisfileundefs.h
new file mode 100644
index 00000000..bfa2e16e
--- /dev/null
+++ b/src/wrapped/generated/wrappedvorbisfileundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedvorbisfileUNDEFS_H_
+#define __wrappedvorbisfileUNDEFS_H_
+
+
+#endif // __wrappedvorbisfileUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedxineramadefs.h b/src/wrapped/generated/wrappedxineramadefs.h
new file mode 100644
index 00000000..5192843f
--- /dev/null
+++ b/src/wrapped/generated/wrappedxineramadefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedxineramaDEFS_H_
+#define __wrappedxineramaDEFS_H_
+
+
+#endif // __wrappedxineramaDEFS_H_
diff --git a/src/wrapped/generated/wrappedxineramatypes.h b/src/wrapped/generated/wrappedxineramatypes.h
new file mode 100644
index 00000000..b4896566
--- /dev/null
+++ b/src/wrapped/generated/wrappedxineramatypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedxineramaTYPES_H_
+#define __wrappedxineramaTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedxineramaTYPES_H_
diff --git a/src/wrapped/generated/wrappedxineramaundefs.h b/src/wrapped/generated/wrappedxineramaundefs.h
new file mode 100644
index 00000000..46e8fd17
--- /dev/null
+++ b/src/wrapped/generated/wrappedxineramaundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedxineramaUNDEFS_H_
+#define __wrappedxineramaUNDEFS_H_
+
+
+#endif // __wrappedxineramaUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedxkbcommondefs.h b/src/wrapped/generated/wrappedxkbcommondefs.h
new file mode 100644
index 00000000..f1574497
--- /dev/null
+++ b/src/wrapped/generated/wrappedxkbcommondefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedxkbcommonDEFS_H_
+#define __wrappedxkbcommonDEFS_H_
+
+
+#endif // __wrappedxkbcommonDEFS_H_
diff --git a/src/wrapped/generated/wrappedxkbcommontypes.h b/src/wrapped/generated/wrappedxkbcommontypes.h
new file mode 100644
index 00000000..a5d7bb92
--- /dev/null
+++ b/src/wrapped/generated/wrappedxkbcommontypes.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedxkbcommonTYPES_H_
+#define __wrappedxkbcommonTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedxkbcommonTYPES_H_
diff --git a/src/wrapped/generated/wrappedxkbcommonundefs.h b/src/wrapped/generated/wrappedxkbcommonundefs.h
new file mode 100644
index 00000000..0825ff12
--- /dev/null
+++ b/src/wrapped/generated/wrappedxkbcommonundefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedxkbcommonUNDEFS_H_
+#define __wrappedxkbcommonUNDEFS_H_
+
+
+#endif // __wrappedxkbcommonUNDEFS_H_
diff --git a/src/wrapped/generated/wrappedxkbcommonx11defs.h b/src/wrapped/generated/wrappedxkbcommonx11defs.h
new file mode 100644
index 00000000..0ec12be9
--- /dev/null
+++ b/src/wrapped/generated/wrappedxkbcommonx11defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedxkbcommonx11DEFS_H_
+#define __wrappedxkbcommonx11DEFS_H_
+
+
+#endif // __wrappedxkbcommonx11DEFS_H_
diff --git a/src/wrapped/generated/wrappedxkbcommonx11types.h b/src/wrapped/generated/wrappedxkbcommonx11types.h
new file mode 100644
index 00000000..21f869dd
--- /dev/null
+++ b/src/wrapped/generated/wrappedxkbcommonx11types.h
@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedxkbcommonx11TYPES_H_
+#define __wrappedxkbcommonx11TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedxkbcommonx11TYPES_H_
diff --git a/src/wrapped/generated/wrappedxkbcommonx11undefs.h b/src/wrapped/generated/wrappedxkbcommonx11undefs.h
new file mode 100644
index 00000000..066ab2bb
--- /dev/null
+++ b/src/wrapped/generated/wrappedxkbcommonx11undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedxkbcommonx11UNDEFS_H_
+#define __wrappedxkbcommonx11UNDEFS_H_
+
+
+#endif // __wrappedxkbcommonx11UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedxml2defs.h b/src/wrapped/generated/wrappedxml2defs.h
new file mode 100644
index 00000000..df6c6320
--- /dev/null
+++ b/src/wrapped/generated/wrappedxml2defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedxml2DEFS_H_
+#define __wrappedxml2DEFS_H_
+
+
+#endif // __wrappedxml2DEFS_H_
diff --git a/src/wrapped/generated/wrappedxml2undefs.h b/src/wrapped/generated/wrappedxml2undefs.h
new file mode 100644
index 00000000..32c05198
--- /dev/null
+++ b/src/wrapped/generated/wrappedxml2undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedxml2UNDEFS_H_
+#define __wrappedxml2UNDEFS_H_
+
+
+#endif // __wrappedxml2UNDEFS_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 6b17d610..b0e6e7e2 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -836,6 +836,7 @@ typedef void (*vFullip_t)(uint64_t, intptr_t, intptr_t, int64_t, void*);
 typedef void (*vFupupi_t)(uint64_t, void*, uint64_t, void*, int64_t);
 typedef void (*vFuppip_t)(uint64_t, void*, void*, int64_t, void*);
 typedef void (*vFupppp_t)(uint64_t, void*, void*, void*, void*);
+typedef void (*vFUUppp_t)(uint64_t, uint64_t, void*, void*, void*);
 typedef void (*vFfffff_t)(float, float, float, float, float);
 typedef void (*vFddddp_t)(double, double, double, double, void*);
 typedef void (*vFpiiii_t)(void*, int64_t, int64_t, int64_t, int64_t);
@@ -2356,6 +2357,7 @@ void vFullip(x64emu_t *emu, uintptr_t fcn) { vFullip_t fn = (vFullip_t)fcn; fn((
 void vFupupi(x64emu_t *emu, uintptr_t fcn) { vFupupi_t fn = (vFupupi_t)fcn; fn((uint64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void vFuppip(x64emu_t *emu, uintptr_t fcn) { vFuppip_t fn = (vFuppip_t)fcn; fn((uint64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (void*)R_R8); }
 void vFupppp(x64emu_t *emu, uintptr_t fcn) { vFupppp_t fn = (vFupppp_t)fcn; fn((uint64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void vFUUppp(x64emu_t *emu, uintptr_t fcn) { vFUUppp_t fn = (vFUUppp_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFfffff(x64emu_t *emu, uintptr_t fcn) { vFfffff_t fn = (vFfffff_t)fcn; fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0]); }
 void vFddddp(x64emu_t *emu, uintptr_t fcn) { vFddddp_t fn = (vFddddp_t)fcn; fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], (void*)R_RDI); }
 void vFpiiii(x64emu_t *emu, uintptr_t fcn) { vFpiiii_t fn = (vFpiiii_t)fcn; fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
@@ -3778,6 +3780,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFupupi) return 1;
 	if (fun == &vFuppip) return 1;
 	if (fun == &vFupppp) return 1;
+	if (fun == &vFUUppp) return 1;
 	if (fun == &vFfffff) return 6;
 	if (fun == &vFddddp) return 5;
 	if (fun == &vFpiiii) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index d5bb59d6..2eee185d 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -17,7 +17,7 @@ typedef void (*wrapper_t)(x64emu_t* emu, uintptr_t fnc);
 // C = unsigned byte c = char
 // W = unsigned short w = short
 // u = uint32, i = int32
-// U = uint64, I= int64
+// U = uint64, I = int64
 // L = unsigned long, l = signed long (long is an int with the size of a pointer)
 // H = Huge 128bits value/struct
 // p = pointer, P = void* on the stack
@@ -835,6 +835,7 @@ void vFullip(x64emu_t *emu, uintptr_t fnc);
 void vFupupi(x64emu_t *emu, uintptr_t fnc);
 void vFuppip(x64emu_t *emu, uintptr_t fnc);
 void vFupppp(x64emu_t *emu, uintptr_t fnc);
+void vFUUppp(x64emu_t *emu, uintptr_t fnc);
 void vFfffff(x64emu_t *emu, uintptr_t fnc);
 void vFddddp(x64emu_t *emu, uintptr_t fnc);
 void vFpiiii(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedlib_init.h b/src/wrapped/wrappedlib_init.h
index 9e69d5a2..e19d4352 100755
--- a/src/wrapped/wrappedlib_init.h
+++ b/src/wrapped/wrappedlib_init.h
@@ -11,7 +11,12 @@
 #define MAPNAME3(N,M) N##M
 #define MAPNAME2(N,M) MAPNAME3(N,M)
 #define MAPNAME(N) MAPNAME2(LIBNAME,N)
+
 // prepare the maps
+#define _DOIT(P,Q) QUOTE(generated/wrapped##P##Q.h)
+#define DOIT(P,Q) _DOIT(P,Q)
+#include DOIT(LIBNAME,defs)
+
 // regular symbol mapped to itself
 #define GO(N, W)
 // regular symbol mapped to itself, but weak
@@ -102,6 +107,9 @@ static const map_onedata_t MAPNAME(mydatamap)[] = {
 #undef DATAB
 #undef DATAM
 
+#include DOIT(LIBNAME,undefs)
+#undef DOIT
+#undef _DOIT
 
 void NativeLib_CommonInit(library_t *lib);
 int FUNC(_init)(library_t* lib, box64context_t* box64)
diff --git a/src/wrapped/wrappedsdl2.c b/src/wrapped/wrappedsdl2.c
index 0de950a4..7e266c17 100755
--- a/src/wrapped/wrappedsdl2.c
+++ b/src/wrapped/wrappedsdl2.c
@@ -80,13 +80,11 @@ typedef struct
 
 typedef void  (*vFv_t)();
 typedef void  (*vFiupV_t)(int64_t, uint64_t, void*, va_list);
-typedef void  (*vFGppp_t)(SDL_JoystickGUID, void*, void*, void*);
 #define ADDED_FUNCTIONS() \
     GO(SDL_Quit, vFv_t)           \
     GO(SDL_AllocRW, sdl2_allocrw) \
     GO(SDL_FreeRW, sdl2_freerw)   \
-    GO(SDL_LogMessageV, vFiupV_t) \
-    GO(SDL_GetJoystickGUIDInfo, vFGppp_t)
+    GO(SDL_LogMessageV, vFiupV_t)
 #include "generated/wrappedsdl2types.h"
 
 typedef struct sdl2_my_s {
@@ -880,17 +878,17 @@ EXPORT void my2_SDL_GetJoystickGUIDInfo(SDL_JoystickGUID guid, uint16_t *vend, u
         my->SDL_GetJoystickGUIDInfo(guid, vend, prod, ver);
     // fallback
     else {
-	uint16_t *guid16 = (uint16_t *)guid.data;
-	if (guid16[1]==0x0000 && guid16[3]==0x0000 && guid16[5]==0x0000)
-    	{
-	    if(vend) *vend = guid16[2];
-	    if(prod) *prod = guid16[4];
-	    if(ver)  *ver  = guid16[6];
-	} else {
+        uint16_t *guid16 = (uint16_t *)guid.data;
+        if (guid16[1]==0x0000 && guid16[3]==0x0000 && guid16[5]==0x0000)
+            {
+            if(vend) *vend = guid16[2];
+            if(prod) *prod = guid16[4];
+            if(ver)  *ver  = guid16[6];
+        } else {
             if(vend) *vend = 0;
             if(prod) *prod = 0;
             if(ver)  *ver  = 0;
-	}
+        }
     }
 }
 
diff --git a/src/wrapped/wrappedsdl2_private.h b/src/wrapped/wrappedsdl2_private.h
index 299119ec..02907b0e 100755
--- a/src/wrapped/wrappedsdl2_private.h
+++ b/src/wrapped/wrappedsdl2_private.h
@@ -2,6 +2,8 @@
 #error Meh!
 #endif
 
+//%S G SDL_JoystickGUID UU
+
 // _fini
 // _init
 GO(SDL_abs, iFi)
@@ -198,7 +200,7 @@ GO(SDL_GetGlobalMouseState, uFpp)
 GO(SDL_GetGrabbedWindow, pFv)
 GO(SDL_GetHint, pFp)
 GO(SDL_GetHintBoolean, iFpi)
-GOM(SDL_GetJoystickGUIDInfo, vFppppp)   //%% the flat SDL_JoystickGUID stuct in 1st argument is same as 2 uint64
+GOM(SDL_GetJoystickGUIDInfo, vFGppp)
 GO(SDL_GetKeyboardFocus, pFv)
 GO(SDL_GetKeyboardState, pFp)
 GO(SDL_GetKeyFromName, pFp)