diff --git a/mozilla/layout/html/table/src/celldata.h b/mozilla/layout/html/table/src/celldata.h
index f7d041a29ca..4d5d2e6a10e 100644
--- a/mozilla/layout/html/table/src/celldata.h
+++ b/mozilla/layout/html/table/src/celldata.h
@@ -18,6 +18,8 @@
 #ifndef CellData_h__
 #define CellData_h__
 
+#include "nsISupports.h"
+
 class nsTableCellFrame;
 
 /** Data stored by nsCellMap to rationalize rowspan and colspan cells.
@@ -33,9 +35,16 @@ class CellData
 {
 public:
   CellData();
+
+#ifndef NS_BUILD_REFCNT_LOGGING
   CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData, CellData* aColSpanData)
     : mOrigCell(aOrigCell), mRowSpanData(aRowSpanData), mColSpanData(aColSpanData)
-  {}
+  {
+  }
+#else
+  CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData,
+           CellData* aColSpanData);
+#endif
 
   ~CellData();
 
diff --git a/mozilla/layout/html/table/src/nsCellMap.cpp b/mozilla/layout/html/table/src/nsCellMap.cpp
index 10c5c437492..c62b96286c2 100644
--- a/mozilla/layout/html/table/src/nsCellMap.cpp
+++ b/mozilla/layout/html/table/src/nsCellMap.cpp
@@ -34,6 +34,17 @@ CellData::CellData()
   mColSpanData = nsnull;
 }
 
+#ifdef NS_BUILD_REFCNT_LOGGING
+CellData::CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData,
+                   CellData* aColSpanData)
+  : mOrigCell(aOrigCell),
+    mRowSpanData(aRowSpanData),
+    mColSpanData(aColSpanData)
+{
+  MOZ_COUNT_CTOR(CellData);
+}
+#endif
+
 CellData::~CellData()
 {
   MOZ_COUNT_DTOR(CellData);
diff --git a/mozilla/layout/tables/celldata.h b/mozilla/layout/tables/celldata.h
index f7d041a29ca..4d5d2e6a10e 100644
--- a/mozilla/layout/tables/celldata.h
+++ b/mozilla/layout/tables/celldata.h
@@ -18,6 +18,8 @@
 #ifndef CellData_h__
 #define CellData_h__
 
+#include "nsISupports.h"
+
 class nsTableCellFrame;
 
 /** Data stored by nsCellMap to rationalize rowspan and colspan cells.
@@ -33,9 +35,16 @@ class CellData
 {
 public:
   CellData();
+
+#ifndef NS_BUILD_REFCNT_LOGGING
   CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData, CellData* aColSpanData)
     : mOrigCell(aOrigCell), mRowSpanData(aRowSpanData), mColSpanData(aColSpanData)
-  {}
+  {
+  }
+#else
+  CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData,
+           CellData* aColSpanData);
+#endif
 
   ~CellData();
 
diff --git a/mozilla/layout/tables/nsCellMap.cpp b/mozilla/layout/tables/nsCellMap.cpp
index 10c5c437492..c62b96286c2 100644
--- a/mozilla/layout/tables/nsCellMap.cpp
+++ b/mozilla/layout/tables/nsCellMap.cpp
@@ -34,6 +34,17 @@ CellData::CellData()
   mColSpanData = nsnull;
 }
 
+#ifdef NS_BUILD_REFCNT_LOGGING
+CellData::CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData,
+                   CellData* aColSpanData)
+  : mOrigCell(aOrigCell),
+    mRowSpanData(aRowSpanData),
+    mColSpanData(aColSpanData)
+{
+  MOZ_COUNT_CTOR(CellData);
+}
+#endif
+
 CellData::~CellData()
 {
   MOZ_COUNT_DTOR(CellData);