I tend to agree with Stephen on the disadvantages of include in signatures. I think it definitely makes sense for things that should be idioms well internalized (like maybe the layout stuff) but I think that trying to factor out all of the similarities into a hierarchy of inclusions just makes it very painful to follow what is being defined.