Fixed up some include problems