diff --git a/src/xenia/kernel/objects/xuser_module.h b/src/xenia/kernel/objects/xuser_module.h
index 3026a02a7..74dc1c47b 100644
--- a/src/xenia/kernel/objects/xuser_module.h
+++ b/src/xenia/kernel/objects/xuser_module.h
@@ -35,7 +35,8 @@ class XUserModule : public XModule {
   uint32_t GetProcAddressByName(const char* name) override;
   X_STATUS GetSection(const char* name, uint32_t* out_section_data,
                       uint32_t* out_section_size) override;
-  X_STATUS GetOptHeader(xe_xex2_header_keys key, uint32_t* out_header_guest_ptr);
+  X_STATUS GetOptHeader(xe_xex2_header_keys key,
+                        uint32_t* out_header_guest_ptr);
 
   X_STATUS Launch(uint32_t flags);
 
diff --git a/src/xenia/kernel/util/xex2.cc b/src/xenia/kernel/util/xex2.cc
index 2eea304be..5d64f15c6 100644
--- a/src/xenia/kernel/util/xex2.cc
+++ b/src/xenia/kernel/util/xex2.cc
@@ -29,19 +29,19 @@
 
 namespace xe {
 namespace kernel {
-uint8_t* xex2_get_opt_header(const xex2_header* header, uint32_t key) {
+uint8_t *xex2_get_opt_header(const xex2_header *header, uint32_t key) {
   for (uint32_t i = 0; i < header->header_count; i++) {
-    const xex2_opt_header& opt_header = header->headers[i];
+    const xex2_opt_header &opt_header = header->headers[i];
     if (opt_header.key != key) {
       continue;
     }
 
     if ((opt_header.key & 0xFF) == 0x01) {
       // Data is stored in the opt header
-      return (uint8_t*)&opt_header.value;
+      return (uint8_t *)&opt_header.value;
     } else {
       // Data stored at offset.
-      return ((uint8_t*)&header->headers[0] + opt_header.offset);
+      return ((uint8_t *)&header->headers[0] + opt_header.offset);
     }
   }
 
diff --git a/src/xenia/kernel/xam_info.cc b/src/xenia/kernel/xam_info.cc
index e2cc7de17..d503ea7d1 100644
--- a/src/xenia/kernel/xam_info.cc
+++ b/src/xenia/kernel/xam_info.cc
@@ -78,7 +78,8 @@ SHIM_CALL XamGetExecutionId_shim(PPCContext* ppc_context,
   assert_not_null(module);
 
   uint32_t guest_hdr_ptr;
-  X_STATUS result = module->GetOptHeader(XEX_HEADER_EXECUTION_INFO, &guest_hdr_ptr);
+  X_STATUS result =
+      module->GetOptHeader(XEX_HEADER_EXECUTION_INFO, &guest_hdr_ptr);
 
   if (XFAILED(result)) {
     SHIM_SET_RETURN_32(result);