diff --git a/src/servo/jsupm_servo.i b/src/servo/jsupm_servo.i
index 8b630f83..5373fd03 100644
--- a/src/servo/jsupm_servo.i
+++ b/src/servo/jsupm_servo.i
@@ -1,8 +1,12 @@
 %module jsupm_servo
 %include "../upm.i"
 
+%include "servo.h"
 %{
     #include "servo.h"
 %}
 
-%include "servo.h"
+%include "es08a.h"
+%{
+    #include "es08a.h"
+%}
diff --git a/src/servo/pyupm_servo.i b/src/servo/pyupm_servo.i
index f8f50856..59805989 100644
--- a/src/servo/pyupm_servo.i
+++ b/src/servo/pyupm_servo.i
@@ -1,7 +1,10 @@
 %module pyupm_servo
 %include "../upm.i"
 
-%feature("autodoc", "3");
+%include "servo.h"
+%{
+    #include "servo.h"
+%}
 
 %include "es08a.h"
 %{