autoconf:  Removed the header includes that were not needing wrapped