Though I disagree with these lint fixes, I want travis to shut up.

src/xenia/kernel/xboxkrnl/xboxkrnl_audio.cc

@@ -7,13 +7,13 @@
  ******************************************************************************
  */
 
+#include "xenia/xbox.h"
 #include "xenia/apu/audio_system.h"
 #include "xenia/base/logging.h"
 #include "xenia/emulator.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
-#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_crypt.cc

@@ -7,11 +7,11 @@
 ******************************************************************************
 */
 
+#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
-#include "xenia/xbox.h"
 
 #include "third_party/crypto/TinySHA1.hpp"
 

src/xenia/kernel/xboxkrnl/xboxkrnl_debug.cc

@@ -7,13 +7,13 @@
  ******************************************************************************
  */
 
+#include "xenia/xbox.h"
 #include "xenia/base/debugging.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
 #include "xenia/kernel/xthread.h"
-#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_hal.cc

@@ -7,11 +7,11 @@
  ******************************************************************************
  */
 
+#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
-#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_io.cc

@@ -7,6 +7,7 @@
  ******************************************************************************
  */
 
+#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/memory.h"
 #include "xenia/cpu/processor.h"
@@ -18,7 +19,6 @@
 #include "xenia/kernel/xiocompletion.h"
 #include "xenia/kernel/xthread.h"
 #include "xenia/vfs/device.h"
-#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_misc.cc

@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
+#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
 #include "xenia/kernel/xthread.h"
-#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_modules.cc

@@ -7,6 +7,7 @@
  ******************************************************************************
  */
 
+#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/cpu/processor.h"
 #include "xenia/kernel/kernel_state.h"
@@ -14,7 +15,6 @@
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/util/xex2.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
-#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_ob.cc

@@ -7,6 +7,7 @@
  ******************************************************************************
  */
 
+#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
@@ -14,7 +15,6 @@
 #include "xenia/kernel/xobject.h"
 #include "xenia/kernel/xsemaphore.h"
 #include "xenia/kernel/xthread.h"
-#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {

src/xenia/kernel/xboxkrnl/xboxkrnl_usbcam.cc

@@ -7,11 +7,11 @@
  ******************************************************************************
  */
 
+#include "xenia/xbox.h"
 #include "xenia/base/logging.h"
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
-#include "xenia/xbox.h"
 
 namespace xe {
 namespace kernel {