fix constant re-difinision warnings