diff --git a/third_party/clang-format/LICENSE.TXT b/tools/clang-format/LICENSE.TXT
similarity index 100%
rename from third_party/clang-format/LICENSE.TXT
rename to tools/clang-format/LICENSE.TXT
diff --git a/third_party/clang-format/clang-format-bbedit.applescript b/tools/clang-format/clang-format-bbedit.applescript
similarity index 100%
rename from third_party/clang-format/clang-format-bbedit.applescript
rename to tools/clang-format/clang-format-bbedit.applescript
diff --git a/third_party/clang-format/clang-format-diff.py b/tools/clang-format/clang-format-diff.py
similarity index 100%
rename from third_party/clang-format/clang-format-diff.py
rename to tools/clang-format/clang-format-diff.py
diff --git a/third_party/clang-format/clang-format-sublime.py b/tools/clang-format/clang-format-sublime.py
similarity index 100%
rename from third_party/clang-format/clang-format-sublime.py
rename to tools/clang-format/clang-format-sublime.py
diff --git a/third_party/clang-format/clang-format.el b/tools/clang-format/clang-format.el
similarity index 100%
rename from third_party/clang-format/clang-format.el
rename to tools/clang-format/clang-format.el
diff --git a/third_party/clang-format/clang-format.py b/tools/clang-format/clang-format.py
similarity index 100%
rename from third_party/clang-format/clang-format.py
rename to tools/clang-format/clang-format.py
diff --git a/third_party/clang-format/git-clang-format b/tools/clang-format/git-clang-format
similarity index 100%
rename from third_party/clang-format/git-clang-format
rename to tools/clang-format/git-clang-format
diff --git a/xenia-build b/xenia-build
index 8985ad9de..a3249e550 100755
--- a/xenia-build
+++ b/xenia-build
@@ -1528,7 +1528,7 @@ class LintCommand(Command):
             if os.path.exists(difftemp): os.remove(difftemp)
             ret = shell_call([
                 sys.executable,
-                'third_party/clang-format/git-clang-format',
+                '/git-clang-format',
                 '--binary=%s' % (clang_format_binary),
                 '--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
                 '--style=file',
@@ -1545,7 +1545,7 @@ class LintCommand(Command):
                 print('')
                 shell_call([
                     sys.executable,
-                    'third_party/clang-format/git-clang-format',
+                    '/git-clang-format',
                     '--binary=%s' % (clang_format_binary),
                     '--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
                     '--style=file',
@@ -1603,7 +1603,7 @@ class FormatCommand(Command):
             print('- git-clang-format')
             shell_call([
                 sys.executable,
-                'third_party/clang-format/git-clang-format',
+                '/git-clang-format',
                 '--binary=%s' % (clang_format_binary),
                 '--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
                 ])