Fixed two includes outside of header guard
Merge branch 'Developer' into SwitchStation