
- reduce usage of "common.h" to a minimum
