WaE: struct/class inconsistency

Drop a couple of unnecessary forward declarations for classes defined in files
included earlier from the same file.

Change-Id: I9a0a24f88990447d7eafe0438f3713e58f649cf9