Dirty fix for missing headers