Moved includes into solid block