6 files changed, 26 insertions, 20 deletions
diff --git a/src/smt/Makefile.am b/src/smt/Makefile.am
index 2f9f08302..3e777ec89 100644
--- a/src/smt/Makefile.am
+++ b/src/smt/Makefile.am
@@ -11,3 +11,9 @@ libsmt_la_SOURCES = \
 	modal_exception.h \
 	bad_option_exception.h \
 	no_such_function_exception.h
+
+EXTRA_DIST = \
+	bad_option_exception.i \
+	no_such_function_exception.i \
+	modal_exception.i \
+	smt_engine.i
diff --git a/src/smt/bad_option_exception.i b/src/smt/bad_option_exception.i
new file mode 100644
index 000000000..ddb0e3919
--- /dev/null
+++ b/src/smt/bad_option_exception.i
@@ -0,0 +1,5 @@
+%{
+#include "smt/bad_option_exception.h"
+%}
+
+%include "smt/bad_option_exception.h"
diff --git a/src/smt/modal_exception.i b/src/smt/modal_exception.i
new file mode 100644
index 000000000..d82d95666
--- /dev/null
+++ b/src/smt/modal_exception.i
@@ -0,0 +1,5 @@
+%{
+#include "smt/modal_exception.h"
+%}
+
+%include "smt/modal_exception.h"
diff --git a/src/smt/no_such_function_exception.i b/src/smt/no_such_function_exception.i
new file mode 100644
index 000000000..0c67ad0d3
--- /dev/null
+++ b/src/smt/no_such_function_exception.i
@@ -0,0 +1,5 @@
+%{
+#include "smt/no_such_function_exception.h"
+%}
+
+%include "smt/no_such_function_exception.h"
diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h
index 698f9ba2e..d2abf2fce 100644
--- a/src/smt/smt_engine.h
+++ b/src/smt/smt_engine.h
@@ -23,26 +23,6 @@
 
 #include <vector>
 
-#if SWIG
-%include "cvc4_public.h"
-%include "util/rational.h"
-%include "util/exception.h"
-%include "expr/kind.h"
-%include "util/integer.h"
-%include "util/cardinality.h"
-%include "util/sexpr.h"
-%include "util/language.h"
-%include "expr/type.h"
-%include "expr/expr.h"
-%include "expr/expr_manager.h"
-%{
-#include "util/integer.h"
-#include "expr/expr_manager.h"
-#include "expr/type.h"
-#include "expr/expr.h"
-%}
-#endif
-
 #include "context/cdlist_forward.h"
 #include "context/cdmap_forward.h"
 #include "context/cdset_forward.h"
diff --git a/src/smt/smt_engine.i b/src/smt/smt_engine.i
new file mode 100644
index 000000000..64a4f93e2
--- /dev/null
+++ b/src/smt/smt_engine.i
@@ -0,0 +1,5 @@
+%{
+#include "smt/smt_engine.h"
+%}
+
+%include "smt/smt_engine.h"