That is fine. There's no good reason to avoid having multiple-inclusion guards in those files. But a single source file listing the same #include twice is certainly something that should be cleaned up. Thanks, Roland