Revert "Removing unnecessary files"

This reverts commit bd478b0b97278c0ad682bf6c61585667ac0b2b7c.
Updated compile flags and includes. Solution compiles.