Fix path to cube.h in includes

cube.h has moved to core and these two includes where missed.

Change-Id: I5b22e2d47076616c49fcc2422d6db0e14e0dbb6c
Merge topic 'fix-cube-include' into master

7afe83e1 Fix path to cube.h in includes