Fix three BrushFace.h includes
Merge pull request #908 from jeroenjanssens/NewArchitecture

Fix three BrushFace.h includes