Many fixes, using include files for engine

Created by  GPeTJGuaAryfKVDHpJLoiRAiv9jDq5aAapfNcWjYu16v  on January 24, 2024
6NZ7BPIVATMXFWPLIRMTU2GQPYEWSZQ4TSIN6MW3OJWLHEYXR6KAC
Change contents