Factorize and remove includes

Speeds up compilation and removes dependency on bionic source