diff --git a/lib/swig/tick/hawkes/simulation/hawkes_kernels.i b/lib/swig/tick/hawkes/simulation/hawkes_kernels.i
index 84ce763e0..c3a3b4f4f 100644
--- a/lib/swig/tick/hawkes/simulation/hawkes_kernels.i
+++ b/lib/swig/tick/hawkes/simulation/hawkes_kernels.i
@@ -1,12 +1,5 @@
 // License: BSD 3 clause
 
-%include <std_shared_ptr.i>
-%shared_ptr(HawkesKernel);
-%shared_ptr(HawkesKernelExp);
-%shared_ptr(HawkesKernelSumExp);
-%shared_ptr(HawkesKernelPowerLaw);
-%shared_ptr(HawkesKernelTimeFunc);
-%shared_ptr(HawkesKernel0);
 
 class HawkesKernel {
  public:
diff --git a/lib/swig/tick/hawkes/simulation/hawkes_simulation_module.i b/lib/swig/tick/hawkes/simulation/hawkes_simulation_module.i
index f1c85e2ec..206f53f4c 100644
--- a/lib/swig/tick/hawkes/simulation/hawkes_simulation_module.i
+++ b/lib/swig/tick/hawkes/simulation/hawkes_simulation_module.i
@@ -4,6 +4,13 @@
 
 %include tick/base/defs.i
 %include tick/base/serialization.i
+%include <std_shared_ptr.i>
+%shared_ptr(HawkesKernel);
+%shared_ptr(HawkesKernelExp);
+%shared_ptr(HawkesKernelSumExp);
+%shared_ptr(HawkesKernelPowerLaw);
+%shared_ptr(HawkesKernelTimeFunc);
+%shared_ptr(HawkesKernel0);
 
 %{
 #include "tick/base/tick_python.h"
diff --git a/lib/swig/tick/solver/sto_solver.i b/lib/swig/tick/solver/sto_solver.i
index 5f94de428..e51191c35 100644
--- a/lib/swig/tick/solver/sto_solver.i
+++ b/lib/swig/tick/solver/sto_solver.i
@@ -9,7 +9,7 @@
 %}
 
 %include "tick/array/array_module.i"
-%include "tick/base_model/model.i"
+%include "tick/base_model/base_model_module.i"
 %include "tick/prox/prox_module.i"
 
 %template(IntVector) std::vector<int>;