really fix 71aff39be458f0c5600e0089d7f3766ba99adf3a, compile.xml had redundant includes, refs #1039
merge [4223/branches/1.0], refs #1039