revision of constants and includes