Shiphandle

introduced generic handle
removed some includes from headers