apex: fix-up includes

Change-Id: If3e31cfcd793512919dbab6b6af2da6426139c4c