There still seem to be some casualties since the include file shakeup a
few revisions back, this adds quite a few missing ones, more to come.