Refactored INC files due to modular support