Fix struct vs. class mismatches

Fix class vs. struct mismatches clang whines about.

Change-Id: Ia551c796b6a5df8317943715447d0c28cdbf465a
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>