Cleaned up .h files. Added common.h