Remove include, extract constants to lib