UPDATED: Eluna

REMOVED: Unneeded includes.

FIXED: More Linux compile errors.