So the problem I predicted when I saw the big C4Include.cpp file actually happened: Sven2 left out some necessary #include statements and broke the build for everybody not using MSVC. And one couldn't even work around this using -DBIG_C4INCLUDE because Isilkor removed that option from C4Include.h. So I removed the extranous includes from C4Include.cpp to prevent this from happening again. But this raises the question of whether to add those includes to C4Include.h conditionally, unconditionally, or not at all. Doing it unconditionally has a drawback: Changing any header would result in a complete recompilation of the entire project. On the other hand, through the help of precompiled headers, that recompilation might be significantly faster. Ideally, we would gather some data on how big an impact this has.