Fixed missing files and definitions