diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+### 2.0.5
+
++ List autogenerated modules in .cabal file
+
 ### 2.0.4
 
 + Update to haskell-gi(-base) 0.22
diff --git a/GI/Xlib.hs b/GI/Xlib.hs
deleted file mode 100644
--- a/GI/Xlib.hs
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib
-    (     module GI.Xlib.Functions                ,
-    module GI.Xlib.Structs                  ,
-    module GI.Xlib.Unions                   ,
-
-
-
-    module Data.GI.Base                     ,
-
-
-    ) where
-
-import GI.Xlib.Functions
-import GI.Xlib.Structs
-import GI.Xlib.Unions
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
-import Data.GI.Base
-
diff --git a/GI/Xlib/Functions.hs b/GI/Xlib/Functions.hs
deleted file mode 100644
--- a/GI/Xlib/Functions.hs
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Functions
-    ( 
-
- -- * Methods
--- ** openDisplay #method:openDisplay#
-
-    openDisplay                             ,
-
-
-
-
-    ) where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
--- function XOpenDisplay
--- Args : []
--- Lengths : []
--- returnType : Nothing
--- throws : False
--- Skip return : False
-
-foreign import ccall "XOpenDisplay" _XOpenDisplay :: 
-    IO ()
-
-{- |
-/No description available in the introspection data./
--}
-openDisplay ::
-    (B.CallStack.HasCallStack, MonadIO m) =>
-    m ()
-openDisplay  = liftIO $ do
-    _XOpenDisplay
-    return ()
-
-
-
diff --git a/GI/Xlib/Structs.hs b/GI/Xlib/Structs.hs
deleted file mode 100644
--- a/GI/Xlib/Structs.hs
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Structs
-    (     module GI.Xlib.Structs.Display          ,
-    module GI.Xlib.Structs.Screen           ,
-    module GI.Xlib.Structs.Visual           ,
-    module GI.Xlib.Structs.XConfigureEvent  ,
-    module GI.Xlib.Structs.XFontStruct      ,
-    module GI.Xlib.Structs.XImage           ,
-    module GI.Xlib.Structs.XTrapezoid       ,
-    module GI.Xlib.Structs.XVisualInfo      ,
-    module GI.Xlib.Structs.XWindowAttributes,
-
-
-    ) where
-
-import GI.Xlib.Structs.Display
-import GI.Xlib.Structs.Screen
-import GI.Xlib.Structs.Visual
-import GI.Xlib.Structs.XConfigureEvent
-import GI.Xlib.Structs.XFontStruct
-import GI.Xlib.Structs.XImage
-import GI.Xlib.Structs.XTrapezoid
-import GI.Xlib.Structs.XVisualInfo
-import GI.Xlib.Structs.XWindowAttributes
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
-
diff --git a/GI/Xlib/Structs/Display.hs b/GI/Xlib/Structs/Display.hs
deleted file mode 100644
--- a/GI/Xlib/Structs/Display.hs
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
-
-/No description available in the introspection data./
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Structs.Display
-    ( 
-
--- * Exported types
-    Display(..)                             ,
-    noDisplay                               ,
-
-
-    ) where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
--- | Memory-managed wrapper type.
-newtype Display = Display (ManagedPtr Display)
--- XXX Wrapping a foreign struct/union with no known destructor or size, leak?
-instance WrappedPtr Display where
-    wrappedPtrCalloc = return nullPtr
-    wrappedPtrCopy = return
-    wrappedPtrFree = Nothing
-
--- | A convenience alias for `Nothing` :: `Maybe` `Display`.
-noDisplay :: Maybe Display
-noDisplay = Nothing
-
-
-#if ENABLE_OVERLOADING
-instance O.HasAttributeList Display
-type instance O.AttributeList Display = DisplayAttributeList
-type DisplayAttributeList = ('[ ] :: [(Symbol, *)])
-#endif
-
-#if ENABLE_OVERLOADING
-type family ResolveDisplayMethod (t :: Symbol) (o :: *) :: * where
-    ResolveDisplayMethod l o = O.MethodResolutionFailed l o
-
-instance (info ~ ResolveDisplayMethod t Display, O.MethodInfo info Display p) => OL.IsLabel t (Display -> p) where
-#if MIN_VERSION_base(4,10,0)
-    fromLabel = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#else
-    fromLabel _ = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#endif
-
-#endif
-
-
diff --git a/GI/Xlib/Structs/Display.hs-boot b/GI/Xlib/Structs/Display.hs-boot
deleted file mode 100644
--- a/GI/Xlib/Structs/Display.hs-boot
+++ /dev/null
@@ -1,26 +0,0 @@
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-module GI.Xlib.Structs.Display where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-newtype Display = Display (ManagedPtr Display)
-instance WrappedPtr Display where
diff --git a/GI/Xlib/Structs/Screen.hs b/GI/Xlib/Structs/Screen.hs
deleted file mode 100644
--- a/GI/Xlib/Structs/Screen.hs
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
-
-/No description available in the introspection data./
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Structs.Screen
-    ( 
-
--- * Exported types
-    Screen(..)                              ,
-    noScreen                                ,
-
-
-    ) where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
--- | Memory-managed wrapper type.
-newtype Screen = Screen (ManagedPtr Screen)
--- XXX Wrapping a foreign struct/union with no known destructor or size, leak?
-instance WrappedPtr Screen where
-    wrappedPtrCalloc = return nullPtr
-    wrappedPtrCopy = return
-    wrappedPtrFree = Nothing
-
--- | A convenience alias for `Nothing` :: `Maybe` `Screen`.
-noScreen :: Maybe Screen
-noScreen = Nothing
-
-
-#if ENABLE_OVERLOADING
-instance O.HasAttributeList Screen
-type instance O.AttributeList Screen = ScreenAttributeList
-type ScreenAttributeList = ('[ ] :: [(Symbol, *)])
-#endif
-
-#if ENABLE_OVERLOADING
-type family ResolveScreenMethod (t :: Symbol) (o :: *) :: * where
-    ResolveScreenMethod l o = O.MethodResolutionFailed l o
-
-instance (info ~ ResolveScreenMethod t Screen, O.MethodInfo info Screen p) => OL.IsLabel t (Screen -> p) where
-#if MIN_VERSION_base(4,10,0)
-    fromLabel = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#else
-    fromLabel _ = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#endif
-
-#endif
-
-
diff --git a/GI/Xlib/Structs/Screen.hs-boot b/GI/Xlib/Structs/Screen.hs-boot
deleted file mode 100644
--- a/GI/Xlib/Structs/Screen.hs-boot
+++ /dev/null
@@ -1,26 +0,0 @@
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-module GI.Xlib.Structs.Screen where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-newtype Screen = Screen (ManagedPtr Screen)
-instance WrappedPtr Screen where
diff --git a/GI/Xlib/Structs/Visual.hs b/GI/Xlib/Structs/Visual.hs
deleted file mode 100644
--- a/GI/Xlib/Structs/Visual.hs
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
-
-/No description available in the introspection data./
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Structs.Visual
-    ( 
-
--- * Exported types
-    Visual(..)                              ,
-    noVisual                                ,
-
-
-    ) where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
--- | Memory-managed wrapper type.
-newtype Visual = Visual (ManagedPtr Visual)
--- XXX Wrapping a foreign struct/union with no known destructor or size, leak?
-instance WrappedPtr Visual where
-    wrappedPtrCalloc = return nullPtr
-    wrappedPtrCopy = return
-    wrappedPtrFree = Nothing
-
--- | A convenience alias for `Nothing` :: `Maybe` `Visual`.
-noVisual :: Maybe Visual
-noVisual = Nothing
-
-
-#if ENABLE_OVERLOADING
-instance O.HasAttributeList Visual
-type instance O.AttributeList Visual = VisualAttributeList
-type VisualAttributeList = ('[ ] :: [(Symbol, *)])
-#endif
-
-#if ENABLE_OVERLOADING
-type family ResolveVisualMethod (t :: Symbol) (o :: *) :: * where
-    ResolveVisualMethod l o = O.MethodResolutionFailed l o
-
-instance (info ~ ResolveVisualMethod t Visual, O.MethodInfo info Visual p) => OL.IsLabel t (Visual -> p) where
-#if MIN_VERSION_base(4,10,0)
-    fromLabel = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#else
-    fromLabel _ = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#endif
-
-#endif
-
-
diff --git a/GI/Xlib/Structs/Visual.hs-boot b/GI/Xlib/Structs/Visual.hs-boot
deleted file mode 100644
--- a/GI/Xlib/Structs/Visual.hs-boot
+++ /dev/null
@@ -1,26 +0,0 @@
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-module GI.Xlib.Structs.Visual where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-newtype Visual = Visual (ManagedPtr Visual)
-instance WrappedPtr Visual where
diff --git a/GI/Xlib/Structs/XConfigureEvent.hs b/GI/Xlib/Structs/XConfigureEvent.hs
deleted file mode 100644
--- a/GI/Xlib/Structs/XConfigureEvent.hs
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
-
-/No description available in the introspection data./
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Structs.XConfigureEvent
-    ( 
-
--- * Exported types
-    XConfigureEvent(..)                     ,
-    noXConfigureEvent                       ,
-
-
-    ) where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
--- | Memory-managed wrapper type.
-newtype XConfigureEvent = XConfigureEvent (ManagedPtr XConfigureEvent)
--- XXX Wrapping a foreign struct/union with no known destructor or size, leak?
-instance WrappedPtr XConfigureEvent where
-    wrappedPtrCalloc = return nullPtr
-    wrappedPtrCopy = return
-    wrappedPtrFree = Nothing
-
--- | A convenience alias for `Nothing` :: `Maybe` `XConfigureEvent`.
-noXConfigureEvent :: Maybe XConfigureEvent
-noXConfigureEvent = Nothing
-
-
-#if ENABLE_OVERLOADING
-instance O.HasAttributeList XConfigureEvent
-type instance O.AttributeList XConfigureEvent = XConfigureEventAttributeList
-type XConfigureEventAttributeList = ('[ ] :: [(Symbol, *)])
-#endif
-
-#if ENABLE_OVERLOADING
-type family ResolveXConfigureEventMethod (t :: Symbol) (o :: *) :: * where
-    ResolveXConfigureEventMethod l o = O.MethodResolutionFailed l o
-
-instance (info ~ ResolveXConfigureEventMethod t XConfigureEvent, O.MethodInfo info XConfigureEvent p) => OL.IsLabel t (XConfigureEvent -> p) where
-#if MIN_VERSION_base(4,10,0)
-    fromLabel = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#else
-    fromLabel _ = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#endif
-
-#endif
-
-
diff --git a/GI/Xlib/Structs/XConfigureEvent.hs-boot b/GI/Xlib/Structs/XConfigureEvent.hs-boot
deleted file mode 100644
--- a/GI/Xlib/Structs/XConfigureEvent.hs-boot
+++ /dev/null
@@ -1,26 +0,0 @@
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-module GI.Xlib.Structs.XConfigureEvent where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-newtype XConfigureEvent = XConfigureEvent (ManagedPtr XConfigureEvent)
-instance WrappedPtr XConfigureEvent where
diff --git a/GI/Xlib/Structs/XFontStruct.hs b/GI/Xlib/Structs/XFontStruct.hs
deleted file mode 100644
--- a/GI/Xlib/Structs/XFontStruct.hs
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
-
-/No description available in the introspection data./
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Structs.XFontStruct
-    ( 
-
--- * Exported types
-    XFontStruct(..)                         ,
-    noXFontStruct                           ,
-
-
-    ) where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
--- | Memory-managed wrapper type.
-newtype XFontStruct = XFontStruct (ManagedPtr XFontStruct)
--- XXX Wrapping a foreign struct/union with no known destructor or size, leak?
-instance WrappedPtr XFontStruct where
-    wrappedPtrCalloc = return nullPtr
-    wrappedPtrCopy = return
-    wrappedPtrFree = Nothing
-
--- | A convenience alias for `Nothing` :: `Maybe` `XFontStruct`.
-noXFontStruct :: Maybe XFontStruct
-noXFontStruct = Nothing
-
-
-#if ENABLE_OVERLOADING
-instance O.HasAttributeList XFontStruct
-type instance O.AttributeList XFontStruct = XFontStructAttributeList
-type XFontStructAttributeList = ('[ ] :: [(Symbol, *)])
-#endif
-
-#if ENABLE_OVERLOADING
-type family ResolveXFontStructMethod (t :: Symbol) (o :: *) :: * where
-    ResolveXFontStructMethod l o = O.MethodResolutionFailed l o
-
-instance (info ~ ResolveXFontStructMethod t XFontStruct, O.MethodInfo info XFontStruct p) => OL.IsLabel t (XFontStruct -> p) where
-#if MIN_VERSION_base(4,10,0)
-    fromLabel = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#else
-    fromLabel _ = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#endif
-
-#endif
-
-
diff --git a/GI/Xlib/Structs/XFontStruct.hs-boot b/GI/Xlib/Structs/XFontStruct.hs-boot
deleted file mode 100644
--- a/GI/Xlib/Structs/XFontStruct.hs-boot
+++ /dev/null
@@ -1,26 +0,0 @@
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-module GI.Xlib.Structs.XFontStruct where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-newtype XFontStruct = XFontStruct (ManagedPtr XFontStruct)
-instance WrappedPtr XFontStruct where
diff --git a/GI/Xlib/Structs/XImage.hs b/GI/Xlib/Structs/XImage.hs
deleted file mode 100644
--- a/GI/Xlib/Structs/XImage.hs
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
-
-/No description available in the introspection data./
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Structs.XImage
-    ( 
-
--- * Exported types
-    XImage(..)                              ,
-    noXImage                                ,
-
-
-    ) where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
--- | Memory-managed wrapper type.
-newtype XImage = XImage (ManagedPtr XImage)
--- XXX Wrapping a foreign struct/union with no known destructor or size, leak?
-instance WrappedPtr XImage where
-    wrappedPtrCalloc = return nullPtr
-    wrappedPtrCopy = return
-    wrappedPtrFree = Nothing
-
--- | A convenience alias for `Nothing` :: `Maybe` `XImage`.
-noXImage :: Maybe XImage
-noXImage = Nothing
-
-
-#if ENABLE_OVERLOADING
-instance O.HasAttributeList XImage
-type instance O.AttributeList XImage = XImageAttributeList
-type XImageAttributeList = ('[ ] :: [(Symbol, *)])
-#endif
-
-#if ENABLE_OVERLOADING
-type family ResolveXImageMethod (t :: Symbol) (o :: *) :: * where
-    ResolveXImageMethod l o = O.MethodResolutionFailed l o
-
-instance (info ~ ResolveXImageMethod t XImage, O.MethodInfo info XImage p) => OL.IsLabel t (XImage -> p) where
-#if MIN_VERSION_base(4,10,0)
-    fromLabel = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#else
-    fromLabel _ = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#endif
-
-#endif
-
-
diff --git a/GI/Xlib/Structs/XImage.hs-boot b/GI/Xlib/Structs/XImage.hs-boot
deleted file mode 100644
--- a/GI/Xlib/Structs/XImage.hs-boot
+++ /dev/null
@@ -1,26 +0,0 @@
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-module GI.Xlib.Structs.XImage where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-newtype XImage = XImage (ManagedPtr XImage)
-instance WrappedPtr XImage where
diff --git a/GI/Xlib/Structs/XTrapezoid.hs b/GI/Xlib/Structs/XTrapezoid.hs
deleted file mode 100644
--- a/GI/Xlib/Structs/XTrapezoid.hs
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
-
-/No description available in the introspection data./
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Structs.XTrapezoid
-    ( 
-
--- * Exported types
-    XTrapezoid(..)                          ,
-    noXTrapezoid                            ,
-
-
-    ) where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
--- | Memory-managed wrapper type.
-newtype XTrapezoid = XTrapezoid (ManagedPtr XTrapezoid)
--- XXX Wrapping a foreign struct/union with no known destructor or size, leak?
-instance WrappedPtr XTrapezoid where
-    wrappedPtrCalloc = return nullPtr
-    wrappedPtrCopy = return
-    wrappedPtrFree = Nothing
-
--- | A convenience alias for `Nothing` :: `Maybe` `XTrapezoid`.
-noXTrapezoid :: Maybe XTrapezoid
-noXTrapezoid = Nothing
-
-
-#if ENABLE_OVERLOADING
-instance O.HasAttributeList XTrapezoid
-type instance O.AttributeList XTrapezoid = XTrapezoidAttributeList
-type XTrapezoidAttributeList = ('[ ] :: [(Symbol, *)])
-#endif
-
-#if ENABLE_OVERLOADING
-type family ResolveXTrapezoidMethod (t :: Symbol) (o :: *) :: * where
-    ResolveXTrapezoidMethod l o = O.MethodResolutionFailed l o
-
-instance (info ~ ResolveXTrapezoidMethod t XTrapezoid, O.MethodInfo info XTrapezoid p) => OL.IsLabel t (XTrapezoid -> p) where
-#if MIN_VERSION_base(4,10,0)
-    fromLabel = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#else
-    fromLabel _ = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#endif
-
-#endif
-
-
diff --git a/GI/Xlib/Structs/XTrapezoid.hs-boot b/GI/Xlib/Structs/XTrapezoid.hs-boot
deleted file mode 100644
--- a/GI/Xlib/Structs/XTrapezoid.hs-boot
+++ /dev/null
@@ -1,26 +0,0 @@
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-module GI.Xlib.Structs.XTrapezoid where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-newtype XTrapezoid = XTrapezoid (ManagedPtr XTrapezoid)
-instance WrappedPtr XTrapezoid where
diff --git a/GI/Xlib/Structs/XVisualInfo.hs b/GI/Xlib/Structs/XVisualInfo.hs
deleted file mode 100644
--- a/GI/Xlib/Structs/XVisualInfo.hs
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
-
-/No description available in the introspection data./
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Structs.XVisualInfo
-    ( 
-
--- * Exported types
-    XVisualInfo(..)                         ,
-    noXVisualInfo                           ,
-
-
-    ) where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
--- | Memory-managed wrapper type.
-newtype XVisualInfo = XVisualInfo (ManagedPtr XVisualInfo)
--- XXX Wrapping a foreign struct/union with no known destructor or size, leak?
-instance WrappedPtr XVisualInfo where
-    wrappedPtrCalloc = return nullPtr
-    wrappedPtrCopy = return
-    wrappedPtrFree = Nothing
-
--- | A convenience alias for `Nothing` :: `Maybe` `XVisualInfo`.
-noXVisualInfo :: Maybe XVisualInfo
-noXVisualInfo = Nothing
-
-
-#if ENABLE_OVERLOADING
-instance O.HasAttributeList XVisualInfo
-type instance O.AttributeList XVisualInfo = XVisualInfoAttributeList
-type XVisualInfoAttributeList = ('[ ] :: [(Symbol, *)])
-#endif
-
-#if ENABLE_OVERLOADING
-type family ResolveXVisualInfoMethod (t :: Symbol) (o :: *) :: * where
-    ResolveXVisualInfoMethod l o = O.MethodResolutionFailed l o
-
-instance (info ~ ResolveXVisualInfoMethod t XVisualInfo, O.MethodInfo info XVisualInfo p) => OL.IsLabel t (XVisualInfo -> p) where
-#if MIN_VERSION_base(4,10,0)
-    fromLabel = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#else
-    fromLabel _ = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#endif
-
-#endif
-
-
diff --git a/GI/Xlib/Structs/XVisualInfo.hs-boot b/GI/Xlib/Structs/XVisualInfo.hs-boot
deleted file mode 100644
--- a/GI/Xlib/Structs/XVisualInfo.hs-boot
+++ /dev/null
@@ -1,26 +0,0 @@
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-module GI.Xlib.Structs.XVisualInfo where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-newtype XVisualInfo = XVisualInfo (ManagedPtr XVisualInfo)
-instance WrappedPtr XVisualInfo where
diff --git a/GI/Xlib/Structs/XWindowAttributes.hs b/GI/Xlib/Structs/XWindowAttributes.hs
deleted file mode 100644
--- a/GI/Xlib/Structs/XWindowAttributes.hs
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
-
-/No description available in the introspection data./
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Structs.XWindowAttributes
-    ( 
-
--- * Exported types
-    XWindowAttributes(..)                   ,
-    noXWindowAttributes                     ,
-
-
-    ) where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
--- | Memory-managed wrapper type.
-newtype XWindowAttributes = XWindowAttributes (ManagedPtr XWindowAttributes)
--- XXX Wrapping a foreign struct/union with no known destructor or size, leak?
-instance WrappedPtr XWindowAttributes where
-    wrappedPtrCalloc = return nullPtr
-    wrappedPtrCopy = return
-    wrappedPtrFree = Nothing
-
--- | A convenience alias for `Nothing` :: `Maybe` `XWindowAttributes`.
-noXWindowAttributes :: Maybe XWindowAttributes
-noXWindowAttributes = Nothing
-
-
-#if ENABLE_OVERLOADING
-instance O.HasAttributeList XWindowAttributes
-type instance O.AttributeList XWindowAttributes = XWindowAttributesAttributeList
-type XWindowAttributesAttributeList = ('[ ] :: [(Symbol, *)])
-#endif
-
-#if ENABLE_OVERLOADING
-type family ResolveXWindowAttributesMethod (t :: Symbol) (o :: *) :: * where
-    ResolveXWindowAttributesMethod l o = O.MethodResolutionFailed l o
-
-instance (info ~ ResolveXWindowAttributesMethod t XWindowAttributes, O.MethodInfo info XWindowAttributes p) => OL.IsLabel t (XWindowAttributes -> p) where
-#if MIN_VERSION_base(4,10,0)
-    fromLabel = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#else
-    fromLabel _ = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#endif
-
-#endif
-
-
diff --git a/GI/Xlib/Structs/XWindowAttributes.hs-boot b/GI/Xlib/Structs/XWindowAttributes.hs-boot
deleted file mode 100644
--- a/GI/Xlib/Structs/XWindowAttributes.hs-boot
+++ /dev/null
@@ -1,26 +0,0 @@
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-module GI.Xlib.Structs.XWindowAttributes where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-newtype XWindowAttributes = XWindowAttributes (ManagedPtr XWindowAttributes)
-instance WrappedPtr XWindowAttributes where
diff --git a/GI/Xlib/Unions.hs b/GI/Xlib/Unions.hs
deleted file mode 100644
--- a/GI/Xlib/Unions.hs
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Unions
-    (     module GI.Xlib.Unions.XEvent            ,
-
-
-    ) where
-
-import GI.Xlib.Unions.XEvent
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
-
diff --git a/GI/Xlib/Unions/XEvent.hs b/GI/Xlib/Unions/XEvent.hs
deleted file mode 100644
--- a/GI/Xlib/Unions/XEvent.hs
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-{- |
-Copyright  : Will Thompson, Iñaki García Etxebarria and Jonas Platte
-License    : LGPL-2.1
-Maintainer : Iñaki García Etxebarria (inaki@blueleaf.cc)
-
-/No description available in the introspection data./
--}
-
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-
-module GI.Xlib.Unions.XEvent
-    ( 
-
--- * Exported types
-    XEvent(..)                              ,
-    noXEvent                                ,
-
-
-    ) where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-
--- | Memory-managed wrapper type.
-newtype XEvent = XEvent (ManagedPtr XEvent)
--- XXX Wrapping a foreign struct/union with no known destructor or size, leak?
-instance WrappedPtr XEvent where
-    wrappedPtrCalloc = return nullPtr
-    wrappedPtrCopy = return
-    wrappedPtrFree = Nothing
-
--- | A convenience alias for `Nothing` :: `Maybe` `XEvent`.
-noXEvent :: Maybe XEvent
-noXEvent = Nothing
-
-
-#if ENABLE_OVERLOADING
-instance O.HasAttributeList XEvent
-type instance O.AttributeList XEvent = XEventAttributeList
-type XEventAttributeList = ('[ ] :: [(Symbol, *)])
-#endif
-
-#if ENABLE_OVERLOADING
-type family ResolveXEventMethod (t :: Symbol) (o :: *) :: * where
-    ResolveXEventMethod l o = O.MethodResolutionFailed l o
-
-instance (info ~ ResolveXEventMethod t XEvent, O.MethodInfo info XEvent p) => OL.IsLabel t (XEvent -> p) where
-#if MIN_VERSION_base(4,10,0)
-    fromLabel = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#else
-    fromLabel _ = O.overloadedMethod (O.MethodProxy :: O.MethodProxy info)
-#endif
-
-#endif
-
-
diff --git a/GI/Xlib/Unions/XEvent.hs-boot b/GI/Xlib/Unions/XEvent.hs-boot
deleted file mode 100644
--- a/GI/Xlib/Unions/XEvent.hs-boot
+++ /dev/null
@@ -1,26 +0,0 @@
-#define ENABLE_OVERLOADING (MIN_VERSION_haskell_gi_overloading(1,0,0) \
-       && !defined(__HADDOCK_VERSION__))
-module GI.Xlib.Unions.XEvent where
-
-import Data.GI.Base.ShortPrelude
-import qualified Data.GI.Base.ShortPrelude as SP
-import qualified Data.GI.Base.Overloading as O
-import qualified Prelude as P
-
-import qualified Data.GI.Base.Attributes as GI.Attributes
-import qualified Data.GI.Base.ManagedPtr as B.ManagedPtr
-import qualified Data.GI.Base.GClosure as B.GClosure
-import qualified Data.GI.Base.GError as B.GError
-import qualified Data.GI.Base.GVariant as B.GVariant
-import qualified Data.GI.Base.GValue as B.GValue
-import qualified Data.GI.Base.GParamSpec as B.GParamSpec
-import qualified Data.GI.Base.CallStack as B.CallStack
-import qualified Data.GI.Base.Properties as B.Properties
-import qualified Data.Text as T
-import qualified Data.ByteString.Char8 as B
-import qualified Data.Map as Map
-import qualified Foreign.Ptr as FP
-import qualified GHC.OverloadedLabels as OL
-
-newtype XEvent = XEvent (ManagedPtr XEvent)
-instance WrappedPtr XEvent where
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Documentation
 Autogenerated documentation for this package can be found at
 
-[https://hackage.haskell.org/package/gi-xlib-2.0.4/docs/GI-Xlib.html](https://hackage.haskell.org/package/gi-xlib-2.0.4/docs/GI-Xlib.html)
+[https://hackage.haskell.org/package/gi-xlib-2.0.5/docs/GI-Xlib.html](https://hackage.haskell.org/package/gi-xlib-2.0.5/docs/GI-Xlib.html)
 
 For general documentation on using [haskell-gi](https://github.com/haskell-gi/haskell-gi) based bindings, see [the project page](https://github.com/haskell-gi/haskell-gi) or [the Wiki](https://github.com/haskell-gi/haskell-gi/wiki).
diff --git a/gi-xlib.cabal b/gi-xlib.cabal
--- a/gi-xlib.cabal
+++ b/gi-xlib.cabal
@@ -1,5 +1,5 @@
 name:                 gi-xlib
-version:              2.0.4
+version:              2.0.5
 synopsis:             xlib bindings
 description:          Bindings for xlib, autogenerated by haskell-gi.
 homepage:             https://github.com/haskell-gi/haskell-gi
@@ -40,6 +40,21 @@
               build-depends: haskell-gi-overloading == 0.0
 
       exposed-modules: GI.Xlib,
+                       GI.Xlib.Functions,
+                       GI.Xlib.Structs,
+                       GI.Xlib.Structs.Display,
+                       GI.Xlib.Structs.Screen,
+                       GI.Xlib.Structs.Visual,
+                       GI.Xlib.Structs.XConfigureEvent,
+                       GI.Xlib.Structs.XFontStruct,
+                       GI.Xlib.Structs.XImage,
+                       GI.Xlib.Structs.XTrapezoid,
+                       GI.Xlib.Structs.XVisualInfo,
+                       GI.Xlib.Structs.XWindowAttributes,
+                       GI.Xlib.Unions,
+                       GI.Xlib.Unions.XEvent
+
+      autogen-modules: GI.Xlib,
                        GI.Xlib.Functions,
                        GI.Xlib.Structs,
                        GI.Xlib.Structs.Display,