Remove unused using statements that caused problems cross-platform.
Moved and added missing file for Xwt project.