fix reference to constants moved to other files

- fix missing import forgot in a previous commit
- fix references to constants moved to other files

Change-Id: Id0ce87b7d8eaf2f5e0a1b8646a76fb530dd690cf
Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com>