So we have consistent multiple inclusion guards now, but some of them are a little bit generic (MMX_H and PNM_H come to mind). I propose giving all of them an MPlayer_ prefix to solve any namespace issues that might arise. I'll do the work. Objections? Diego