diff --git a/mozilla/gfx/src/motif/nsDeviceContextUnix.h b/mozilla/gfx/src/motif/nsDeviceContextUnix.h
index d3571d4b500..94ddef071f5 100644
--- a/mozilla/gfx/src/motif/nsDeviceContextUnix.h
+++ b/mozilla/gfx/src/motif/nsDeviceContextUnix.h
@@ -30,7 +30,7 @@
 #include "X11/Intrinsic.h"
 
 /* nsDrawingSurface is actually the following struct */
-typedef struct nsDrawingSurfaceUnix {
+struct nsDrawingSurfaceUnix {
   Display *display ;
   Drawable drawable ;
   GC       gc ;
diff --git a/mozilla/gfx/src/motif/nsImageUnix.cpp b/mozilla/gfx/src/motif/nsImageUnix.cpp
index 06f198e6f25..7bdfcb587df 100644
--- a/mozilla/gfx/src/motif/nsImageUnix.cpp
+++ b/mozilla/gfx/src/motif/nsImageUnix.cpp
@@ -333,6 +333,7 @@ PRInt16 i;
     ConvertImage(aDrawingSurface);
     CreateImage(aDrawingSurface);
     }
+  return NS_OK;
 }
 
 //------------------------------------------------------------
diff --git a/mozilla/widget/public/nsStringUtil.h b/mozilla/widget/public/nsStringUtil.h
index 4925500ba78..5cadae4c96a 100644
--- a/mozilla/widget/public/nsStringUtil.h
+++ b/mozilla/widget/public/nsStringUtil.h
@@ -76,4 +76,4 @@ if (! _ns_smallBufUsed) \
     delete aBuf; 
 
 
-#endif  // NSStringUtil
\ No newline at end of file
+#endif  // NSStringUtil