diff --git a/scripts/mk_make.py b/scripts/mk_make.py
index e37013745..a79a0034f 100644
--- a/scripts/mk_make.py
+++ b/scripts/mk_make.py
@@ -59,7 +59,8 @@ add_lib('smtlogic_tactics', ['arith_tactics', 'bv_tactics', 'nlsat_tactic', 'smt
 add_lib('ufbv_tactic', ['normal_forms', 'core_tactics', 'macros', 'smt_tactic', 'rewriter'], 'tactic/ufbv')
 add_lib('portfolio', ['smtlogic_tactics', 'ufbv_tactic', 'fpa', 'aig', 'muz_qe', 'sls_tactic', 'subpaving_tactic'], 'tactic/portfolio')
 # TODO: delete SMT 1.0 frontend
-add_lib('api', ['portfolio', 'user_plugin'])
+add_lib('smtparser', ['portfolio'])
+add_lib('api', ['portfolio', 'user_plugin', 'smtparser'])
 add_exe('shell', ['api', 'sat', 'extra_cmds'], exe_name='z3')
 add_exe('test', ['api', 'fuzzing'], exe_name='test-z3')
 API_files = ['z3_api.h']
diff --git a/src/api/smtlib.cpp b/src/smtparser/smtlib.cpp
similarity index 100%
rename from src/api/smtlib.cpp
rename to src/smtparser/smtlib.cpp
diff --git a/src/api/smtlib.h b/src/smtparser/smtlib.h
similarity index 100%
rename from src/api/smtlib.h
rename to src/smtparser/smtlib.h
diff --git a/src/api/smtlib_solver.cpp b/src/smtparser/smtlib_solver.cpp
similarity index 100%
rename from src/api/smtlib_solver.cpp
rename to src/smtparser/smtlib_solver.cpp
diff --git a/src/api/smtlib_solver.h b/src/smtparser/smtlib_solver.h
similarity index 100%
rename from src/api/smtlib_solver.h
rename to src/smtparser/smtlib_solver.h
diff --git a/src/api/smtparser.cpp b/src/smtparser/smtparser.cpp
similarity index 100%
rename from src/api/smtparser.cpp
rename to src/smtparser/smtparser.cpp
diff --git a/src/api/smtparser.h b/src/smtparser/smtparser.h
similarity index 98%
rename from src/api/smtparser.h
rename to src/smtparser/smtparser.h
index dde6068f9..c63f92664 100644
--- a/src/api/smtparser.h
+++ b/src/smtparser/smtparser.h
@@ -23,7 +23,6 @@ Revision History:
 #include"ast.h"
 #include"vector.h"
 #include"smtlib.h"
-#include"z3.h"
 
 namespace smtlib {
     class parser {