Also fix the #endif comment in a few places and #include config.h to
avoid assuming it is #included implicitly.