Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.