- Removed useless forward definition
- Fixed copy-pasta loader bug