Fixed includes.
Changed SWIG options.
Removed unnecessary functions.