diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
index e83c079..2be62a1 100644
--- a/poppler/GlobalParamsWin.cc
+++ b/poppler/GlobalParamsWin.cc
@@ -470,7 +470,7 @@ void GlobalParams::setupBaseFonts(char * dir)
       obj1.initNull();
       parser = new Parser(NULL,
 	      new Lexer(NULL,
-	      new FileStream(file, fileName->getCString(), 0, gFalse, size, &obj1)),
+	      new FileStream(fileno(file), 0, gFalse, size, &obj1)),
 	      gTrue);
       obj1.free();
       parser->getObj(&obj1);
diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
index 56c5918..fa104ff 100644
--- a/poppler/PDFDoc.cc
+++ b/poppler/PDFDoc.cc
@@ -170,7 +170,7 @@ PDFDoc::PDFDoc(GooString *fileNameA, GooString *ownerPassword,
 
   // create stream
   obj.initNull();
-  str = new FileStream(file, fileName->getCString(), 0, gFalse, size, &obj);
+  str = new FileStream(fileno(file), 0, gFalse, size, &obj);
 
   ok = setup(ownerPassword, userPassword);
 }
@@ -221,7 +221,7 @@ PDFDoc::PDFDoc(wchar_t *fileNameA, int fileNameLen, GooString *ownerPassword,
 
   // create stream
   obj.initNull();
-  str = new FileStream(file, fileName->getCString(), 0, gFalse, size, &obj);
+  str = new FileStream(fileno(file), 0, gFalse, size, &obj);
 
   ok = setup(ownerPassword, userPassword);
 }
diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index 6ffd5d3..7c32b2b 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -750,30 +750,14 @@ GBool StreamPredictor::getNextLine() {
 }
 
 //------------------------------------------------------------------------
-// UniqueFileStream
-//------------------------------------------------------------------------
-
-UniqueFileStream::UniqueFileStream(FILE *fA, char *fileNameA, Goffset startA, GBool limitedA,
-		       Goffset lengthA, Object *dictA):
-    FileStream(fA, fileNameA, startA, limitedA, lengthA, dictA) {
-  f = fopen(fileName, "rb");
-}
-
-UniqueFileStream::~UniqueFileStream() {
-  close();
-  fclose(f);
-}
-
-//------------------------------------------------------------------------
 // FileStream
 //------------------------------------------------------------------------
 
-FileStream::FileStream(FILE *fA, char *fileNameA, Goffset startA, GBool limitedA,
+FileStream::FileStream(int fdA, Goffset startA, GBool limitedA,
 		       Goffset lengthA, Object *dictA):
     BaseStream(dictA, lengthA) {
-  f = fA;
-  fileName = fileNameA;
-  start = startA;
+  fd = fdA;
+  offset = start = startA;
   limited = limitedA;
   length = lengthA;
   bufPtr = bufEnd = buf;
@@ -787,17 +771,17 @@ FileStream::~FileStream() {
 }
 
 BaseStream *FileStream::copy() {
-  return new UniqueFileStream(f, fileName, start, limited, length, &dict);
+  return new FileStream(fd, start, limited, length, &dict);
 }
 
 Stream *FileStream::makeSubStream(Goffset startA, GBool limitedA,
 				  Goffset lengthA, Object *dictA) {
-  return new FileStream(f, fileName, startA, limitedA, lengthA, dictA);
+  return new FileStream(fd, startA, limitedA, lengthA, dictA);
 }
 
 void FileStream::reset() {
-  savePos = Gftell(f);
-  Gfseek(f, start, SEEK_SET);
+  savePos = offset;
+  offset = start;
   saved = gTrue;
   bufPtr = bufEnd = buf;
   bufPos = start;
@@ -805,7 +789,7 @@ void FileStream::reset() {
 
 void FileStream::close() {
   if (saved) {
-    Gfseek(f, savePos, SEEK_SET);
+    offset = savePos;
     saved = gFalse;
   }
 }
@@ -823,7 +807,8 @@ GBool FileStream::fillBuf() {
   } else {
     n = fileStreamBufSize;
   }
-  n = fread(buf, 1, n, f);
+  n = pread(fd, buf, n, offset);
+  offset += n;
   bufEnd = buf + n;
   if (bufPtr >= bufEnd) {
     return gFalse;
@@ -835,15 +820,14 @@ void FileStream::setPos(Goffset pos, int dir) {
   Goffset size;
 
   if (dir >= 0) {
-    Gfseek(f, pos, SEEK_SET);
+    offset = pos;
     bufPos = pos;
   } else {
-    Gfseek(f, 0, SEEK_END);
-    size = Gftell(f);
+    size = lseek(fd, 0, SEEK_END);
     if (pos > size)
       pos = size;
-    Gfseek(f, -pos, SEEK_END);
-    bufPos = Gftell(f);
+    offset = size - pos;
+    bufPos = offset;
   }
   bufPtr = bufEnd = buf;
 }
diff --git a/poppler/Stream.h b/poppler/Stream.h
index dfcd530..54ae055 100644
--- a/poppler/Stream.h
+++ b/poppler/Stream.h
@@ -443,7 +443,7 @@ private:
 class FileStream: public BaseStream {
 public:
 
-  FileStream(FILE *fA, char *fileName, Goffset startA, GBool limitedA,
+  FileStream(int fdA, Goffset startA, GBool limitedA,
 	     Goffset lengthA, Object *dictA);
   virtual ~FileStream();
   virtual BaseStream *copy();
@@ -491,10 +491,9 @@ private:
       return n;
     }
 
-protected:
-  FILE *f;
-  char *fileName;
 private:
+  int fd;
+  Goffset offset;
   Goffset start;
   GBool limited;
   char buf[fileStreamBufSize];
@@ -505,14 +504,6 @@ private:
   GBool saved;
 };
 
-class UniqueFileStream: public FileStream {
-public:
-
-  UniqueFileStream(FILE *fA, char *fileNameA, Goffset startA, GBool limitedA,
-	     Goffset lengthA, Object *dictA);
-  virtual ~UniqueFileStream();
-};
-
 //------------------------------------------------------------------------
 // CachedFileStream
 //------------------------------------------------------------------------