diff --git a/content/base/src/Link.cpp b/content/base/src/Link.cpp
index 2486d391278f..1d41cf1b1ff3 100644
--- a/content/base/src/Link.cpp
+++ b/content/base/src/Link.cpp
@@ -55,10 +55,10 @@ namespace mozilla {
 namespace dom {
 
 Link::Link(Element *aElement)
-  : mLinkState(defaultState)
-  , mRegistered(false)
-  , mElement(aElement)
+  : mElement(aElement)
   , mHistory(services::GetHistoryService())
+  , mLinkState(defaultState)
+  , mRegistered(false)
 {
   NS_ABORT_IF_FALSE(mElement, "Must have an element");
 }
@@ -75,7 +75,7 @@ Link::GetLinkState() const
                "Getting the link state of an unregistered Link!");
   NS_ASSERTION(mLinkState != eLinkState_Unknown,
                "Getting the link state with an unknown value!");
-  return mLinkState;
+  return nsLinkState(mLinkState);
 }
 
 void
diff --git a/content/base/src/Link.h b/content/base/src/Link.h
index 1b43bd80ab81..ea9e18ed2762 100644
--- a/content/base/src/Link.h
+++ b/content/base/src/Link.h
@@ -149,17 +149,17 @@ private:
   already_AddRefed<nsIURI> GetURIToMutate();
   void SetHrefAttribute(nsIURI *aURI);
 
-  nsLinkState mLinkState;
-
   mutable nsCOMPtr<nsIURI> mCachedURI;
 
-  bool mRegistered;
-
   Element * const mElement;
 
   // Strong reference to History.  The link has to unregister before History
   // can disappear.
   nsCOMPtr<IHistory> mHistory;
+
+  PRUint16 mLinkState;
+
+  bool mRegistered;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(Link, MOZILLA_DOM_LINK_IMPLEMENTATION_IID)