de-Bart clang header inclusion

Change-Id: I28cb300d942e7240d0e8d39466aa5cfd277776e1