Debian ready

Some modifications to allow unparametrized include on debian systems