[FOLD] Remove needless functions
Add missing include
Consolidate includes and remove unity header