Fixes for the next branch

- Missing headers
- Commented SIMD flag
- Replaced deprecated method