Use an enum instead of const int for event values
Add the source headers