fixed include problems