needed and which trigger build problems. (These two files should probably be unified and put under common/...)