- Include lunaservice.h from the correct place
- Reorder include statements for consistency
- Remove clash in anti-recursion variable names

Open-webOS-DCO-1.0-signed-off-by: Keith Derrick <keith.derrick@palm.com>
Change-Id: If07251a5e9c480632ede4053fac0c1b441d3ecd3