Removed header files from rest of src