Making sure the include order is correct in files
Refactoring AudioHandler. Not the greatest yet, but better than before