Simplified inclusions and avoid prototypes copied in from elsewhere.

This also avoids a warning in anal mode.