Updated header files with new #incldue system

Also deleted some trash.