--- a/ipc/ril/Ril.cpp
+++ b/ipc/ril/Ril.cpp
@@ -228,31 +228,31 @@ RilClient::OnFileCanReadWithoutBlocking(
     //   - mIncoming isn't completely read, but there's no more
     //     data available on the socket
     //     If so, break;
 
     MOZ_ASSERT(fd == mSocket.mFd);
     while (true) {
         if (!mIncoming) {
             mIncoming = new RilRawData();
-            int ret = read(fd, mIncoming->mData, RilRawData.MAX_DATA_SIZE);
+            int ret = read(fd, mIncoming->mData, RilRawData::MAX_DATA_SIZE);
             if (ret <= 0) {
                 LOG("Cannot read from network, error %d\n", ret);
                 // At this point, assume that we can't actually access
                 // the socket anymore, and start a reconnect loop.
                 mIncoming.forget();
                 mReadWatcher.StopWatchingFileDescriptor();
                 mWriteWatcher.StopWatchingFileDescriptor();
                 close(mSocket.mFd);
                 mIOLoop->PostTask(FROM_HERE, new RilReconnectTask());
                 return;
             }
             mIncoming->mSize = ret;
             sConsumer->MessageReceived(mIncoming.forget());
-            if (ret < RilRawData.MAX_DATA_SIZE) {
+            if (ret < RilRawData::MAX_DATA_SIZE) {
                 return;
             }
         }
     }
 }
 
 void
 RilClient::OnFileCanWriteWithoutBlocking(int fd)

--- a/ipc/ril/Ril.h
+++ b/ipc/ril/Ril.h
@@ -42,18 +42,16 @@
 #define mozilla_ipc_Ril_h 1
 
 #include "mozilla/RefPtr.h"
 
 namespace base {
 class MessageLoop;
 }
 
-class nsIThread;
-
 namespace mozilla {
 namespace ipc {
 
 
 /*
  * Represents raw data going to or coming from the RIL socket. Can
  * actually contain multiple RIL parcels in the data block, and may
  * also contain incomplete parcels on the front or back. Actual parcel