DEV: Compatibility with previous definition
DEV: Remove #include