diff --git a/.gdbinit_python b/.gdbinit_python
index 07129d2c1e9c..9ad12bd2ac63 100644
--- a/.gdbinit_python
+++ b/.gdbinit_python
@@ -1,5 +1,5 @@
 python
 import sys
-sys.path.append('third_party/python/gdbpp/')
+sys.path.append('python/gdbpp/')
 import gdbpp
 end
diff --git a/build/.gdbinit_python.in b/build/.gdbinit_python.in
index 50ba4e6c3085..54c5c2db8d70 100644
--- a/build/.gdbinit_python.in
+++ b/build/.gdbinit_python.in
@@ -1,6 +1,6 @@
 #filter substitution
 python
 import sys
-sys.path.append('@topsrcdir@/third_party/python/gdbpp')
+sys.path.append('@topsrcdir@/python/gdbpp')
 import gdbpp
 end
diff --git a/third_party/python/gdbpp/gdbpp/__init__.py b/python/gdbpp/gdbpp/__init__.py
similarity index 100%
rename from third_party/python/gdbpp/gdbpp/__init__.py
rename to python/gdbpp/gdbpp/__init__.py
diff --git a/third_party/python/gdbpp/gdbpp/enumset.py b/python/gdbpp/gdbpp/enumset.py
similarity index 100%
rename from third_party/python/gdbpp/gdbpp/enumset.py
rename to python/gdbpp/gdbpp/enumset.py
diff --git a/third_party/python/gdbpp/gdbpp/linkedlist.py b/python/gdbpp/gdbpp/linkedlist.py
similarity index 100%
rename from third_party/python/gdbpp/gdbpp/linkedlist.py
rename to python/gdbpp/gdbpp/linkedlist.py
diff --git a/third_party/python/gdbpp/gdbpp/owningthread.py b/python/gdbpp/gdbpp/owningthread.py
similarity index 100%
rename from third_party/python/gdbpp/gdbpp/owningthread.py
rename to python/gdbpp/gdbpp/owningthread.py
diff --git a/third_party/python/gdbpp/gdbpp/smartptr.py b/python/gdbpp/gdbpp/smartptr.py
similarity index 100%
rename from third_party/python/gdbpp/gdbpp/smartptr.py
rename to python/gdbpp/gdbpp/smartptr.py
diff --git a/third_party/python/gdbpp/gdbpp/string.py b/python/gdbpp/gdbpp/string.py
similarity index 100%
rename from third_party/python/gdbpp/gdbpp/string.py
rename to python/gdbpp/gdbpp/string.py
diff --git a/third_party/python/gdbpp/gdbpp/tarray.py b/python/gdbpp/gdbpp/tarray.py
similarity index 100%
rename from third_party/python/gdbpp/gdbpp/tarray.py
rename to python/gdbpp/gdbpp/tarray.py
diff --git a/third_party/python/gdbpp/gdbpp/thashtable.py b/python/gdbpp/gdbpp/thashtable.py
similarity index 100%
rename from third_party/python/gdbpp/gdbpp/thashtable.py
rename to python/gdbpp/gdbpp/thashtable.py
diff --git a/python/moz.build b/python/moz.build
index 7208ef13cbaa..590ec9bdcb2f 100644
--- a/python/moz.build
+++ b/python/moz.build
@@ -11,6 +11,9 @@ with Files('**'):
 with Files('devtools/**'):
     BUG_COMPONENT = ('DevTools', 'General')
 
+with Files('gdbpp/**'):
+    BUG_COMPONENT = ('Firefox Build System', 'General')
+
 with Files('mach/**'):
     BUG_COMPONENT = ('Firefox Build System', 'Mach Core')
 
diff --git a/third_party/python/moz.build b/third_party/python/moz.build
index ae44d74f8130..0d59c88d3621 100644
--- a/third_party/python/moz.build
+++ b/third_party/python/moz.build
@@ -32,9 +32,6 @@ with Files('enum34/**'):
 with Files('futures/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
-with Files('gdbpp/**'):
-    BUG_COMPONENT = ('Firefox Build System', 'General')
-
 with Files('jsmin/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')