diff --git a/ports/geckolib/gecko_bindings/bindings.rs b/ports/geckolib/gecko_bindings/bindings.rs
index c3a29f94885..b5019e16d03 100644
--- a/ports/geckolib/gecko_bindings/bindings.rs
+++ b/ports/geckolib/gecko_bindings/bindings.rs
@@ -146,6 +146,10 @@ extern "C" {
     pub fn Gecko_IsRootElement(element: *mut RawGeckoElement) -> bool;
     pub fn Gecko_LocalName(element: *mut RawGeckoElement) -> *mut nsIAtom;
     pub fn Gecko_Namespace(element: *mut RawGeckoElement) -> *mut nsIAtom;
+    pub fn Gecko_GetElementId(element: *mut RawGeckoElement) -> *mut nsIAtom;
+    pub fn Gecko_ClassOrClassList(element: *mut RawGeckoElement,
+                                  class_: *mut *mut nsIAtom,
+                                  classList: *mut *mut *mut nsIAtom) -> u32;
     pub fn Gecko_GetNodeData(node: *mut RawGeckoNode) -> *mut ServoNodeData;
     pub fn Gecko_SetNodeData(node: *mut RawGeckoNode,
                              data: *mut ServoNodeData);
diff --git a/ports/geckolib/gecko_bindings/tools/regen_bindings.sh b/ports/geckolib/gecko_bindings/tools/regen_bindings.sh
index da147247541..13678732f26 100755
--- a/ports/geckolib/gecko_bindings/tools/regen_bindings.sh
+++ b/ports/geckolib/gecko_bindings/tools/regen_bindings.sh
@@ -75,10 +75,16 @@ eval ./rust-bindgen/target/debug/bindgen           \
   -x c++ -std=gnu++0x                              \
   "-I$DIST_INCLUDE"                                \
   "-I$DIST_INCLUDE/nspr/"                          \
-  "-I$SRCDIR/nsprpub/pr/include/"                  \
+  "-I$1/nsprpub/pr/include/"                       \
   $PLATFORM_DEPENDENT_DEFINES                      \
+  -DMOZILLA_INTERNAL_API                           \
+  -DMOZ_STYLO_BINDINGS=1                           \
+  -DJS_DEBUG=1                                     \
+  -DDEBUG=1 -DTRACING=1 -DOS_POSIX=1               \
+  -DIMPL_LIBXUL                                    \
   -o ../bindings.rs                                \
   -no-type-renaming                                \
+  -include "$1/mozilla-config.h"                   \
   "$DIST_INCLUDE/mozilla/ServoBindings.h"          \
   -match "ServoBindings.h"                         \
   -match "nsStyleStructList.h"                     \