Reorder includes to prevent compile error

Change-Id: I5dc9e8a4a03d76e40fa12f72f7910f426e916b98