fixed library/common inclusion (again)