cleanup; moved extern's from .c to .h files for double check