* commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48': testprogs: Clean up #includes Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>