Fix imports for -Wall