Improving SDL_Wrapper redesign. Updated includes