Cleaned up Swiften if.  Moved ncurses header include to single header