introduce src/common; minor include tweaks