remove obsolete workarounds for qmake processing order problems

Change-Id: I4b58eee6243c92f67bdd9c8f9da36ef82a489c12
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
use private linkage where possible

Change-Id: I1f51b7d043f49f2f2849eb370ac71366cbaa6da5
Reviewed-by: Alan Alpert <aalpert@blackberry.com>