Debian ready

Changes to allow unparametrized include on debian systems