Minisat include hierarchy

Changed includes to reflect the minisat include hierarchy, as set up in the resolution of the Debian bug #606643.