Fix KDE includes problem
More code cleanups!