diff --git a/smtLib.cabal b/smtLib.cabal
--- a/smtLib.cabal
+++ b/smtLib.cabal
@@ -1,5 +1,5 @@
 Name:           smtLib
-Version:        1.0.4
+Version:        1.0.5
 License:        BSD3
 License-file:   LICENSE
 Author:         Iavor S. Diatchki
diff --git a/src/SMTLib1.hs b/src/SMTLib1.hs
--- a/src/SMTLib1.hs
+++ b/src/SMTLib1.hs
@@ -1,6 +1,33 @@
 {-# LANGUAGE Safe #-}
-module SMTLib1 (module X) where
+module SMTLib1
+  ( Name(..)
+  , Ident(..)
+  , Quant(..)
+  , Conn(..)
+  , Formula(..)
+  , Sort
+  , Binder(..)
+  , Term(..)
+  , Literal(..)
+  , Annot(..)
+  , FunDecl(..)
+  , PredDecl(..)
+  , Status(..)
+  , Command(..)
+  , Script(..)
 
-import SMTLib1.AST as X
-import SMTLib1.PP as X
+  , (===)
+  , (=/=)
+  , (.<.)
+  , (.>.)
+  , tInt
+  , funDef
+  , constDef
+  , logic
+  , assume
+  , goal
+  ) where
+
+import SMTLib1.AST
+import SMTLib1.PP()
 
diff --git a/src/SMTLib2.hs b/src/SMTLib2.hs
--- a/src/SMTLib2.hs
+++ b/src/SMTLib2.hs
@@ -1,6 +1,24 @@
 {-# LANGUAGE Safe #-}
-module SMTLib2 (module X) where
+module SMTLib2
+  ( Script(..)
+  , Binder(..)
+  , Defn(..)
+  , Type(..)
+  , Expr(..)
 
-import SMTLib2.AST as X
-import SMTLib2.PP as X
+  , Name(..)
+  , Ident(..)
+  , Quant(..)
+  , Literal(..)
+  , Attr(..)
+  , AttrVal
+  , Command(..)
+  , Option(..)
+  , InfoFlag(..)
+
+  , app
+  ) where
+
+import SMTLib2.AST
+import SMTLib2.PP()