fixed double definitions and added h files to gång libraries