*8895* Removing double enabled() check, adding missing function headers.