#1203 Moved some SWIG code from headers to interface files
#1203 Fixed lint