diff --git a/mozilla/layout/generic/nsLineLayout.h b/mozilla/layout/generic/nsLineLayout.h
index b31660e4dd7..5e8f0774584 100644
--- a/mozilla/layout/generic/nsLineLayout.h
+++ b/mozilla/layout/generic/nsLineLayout.h
@@ -246,6 +246,9 @@ protected:
   // state is the state needed to post-process the line after reflow
   // has completed (vertical alignment, horizontal alignment,
   // justification and relative positioning).
+#ifdef AIX
+public:
+#endif /* AIX */
   struct PerSpanData;
   struct PerFrameData {
     // link to next/prev frame in same span
@@ -276,9 +279,16 @@ protected:
     // Other state we use
     PRUint8 mVerticalAlign;
   };
+#ifdef AIX
+protected:
+#endif /* AIX */
+
   PerFrameData mFrameDataBuf[10];
   PerFrameData* mFrameFreeList;
 
+#ifdef AIX
+public:
+#endif /* AIX */
   struct PerSpanData {
     PerSpanData* mNext;
     PerSpanData* mPrev;
@@ -310,6 +320,10 @@ protected:
       mLastFrame = pfd;
     }
   };
+#ifdef AIX
+protected:
+#endif /* AIX */
+
   PerSpanData mSpanDataBuf[4];
   PerSpanData* mSpanFreeList;
   PerSpanData* mRootSpan;
diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in
index 054b114c6ec..28b15ac84d8 100644
--- a/mozilla/layout/html/base/src/Makefile.in
+++ b/mozilla/layout/html/base/src/Makefile.in
@@ -75,6 +75,8 @@ include $(topsrcdir)/config/config.mk
 
 DEFINES += -D_IMPL_NS_HTML
 
+CXXFLAGS += $(OS_CXXFLAGS)
+
 INCLUDES += -I$(srcdir)/../../style/src -I$(srcdir)/../../content/src -I$(srcdir)/../../../base/src -I$(srcdir)/.  -I$(DIST)/oji
 
 MKSHLIB :=
diff --git a/mozilla/layout/html/base/src/nsLineLayout.h b/mozilla/layout/html/base/src/nsLineLayout.h
index b31660e4dd7..5e8f0774584 100644
--- a/mozilla/layout/html/base/src/nsLineLayout.h
+++ b/mozilla/layout/html/base/src/nsLineLayout.h
@@ -246,6 +246,9 @@ protected:
   // state is the state needed to post-process the line after reflow
   // has completed (vertical alignment, horizontal alignment,
   // justification and relative positioning).
+#ifdef AIX
+public:
+#endif /* AIX */
   struct PerSpanData;
   struct PerFrameData {
     // link to next/prev frame in same span
@@ -276,9 +279,16 @@ protected:
     // Other state we use
     PRUint8 mVerticalAlign;
   };
+#ifdef AIX
+protected:
+#endif /* AIX */
+
   PerFrameData mFrameDataBuf[10];
   PerFrameData* mFrameFreeList;
 
+#ifdef AIX
+public:
+#endif /* AIX */
   struct PerSpanData {
     PerSpanData* mNext;
     PerSpanData* mPrev;
@@ -310,6 +320,10 @@ protected:
       mLastFrame = pfd;
     }
   };
+#ifdef AIX
+protected:
+#endif /* AIX */
+
   PerSpanData mSpanDataBuf[4];
   PerSpanData* mSpanFreeList;
   PerSpanData* mRootSpan;