lrlebrao Adds missing header files and adds final to two variables