Log Message:
Specify the category when including other files and when depending on other
packages.  From PR pkg/21864 by ccatrian at eml.cc.