diff --git a/fofi/FoFiBase.h b/fofi/FoFiBase.h
index e255001..a6f1629 100644
--- a/fofi/FoFiBase.h
+++ b/fofi/FoFiBase.h
@@ -9,6 +9,8 @@
 #ifndef FOFIBASE_H
 #define FOFIBASE_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -23,7 +25,7 @@ typedef void (*FoFiOutputFunc)(void *stream, char *data, int len);
 // FoFiBase
 //------------------------------------------------------------------------
 
-class FoFiBase {
+class poppler_EXPORT FoFiBase {
 public:
 
   virtual ~FoFiBase();
diff --git a/fofi/FoFiTrueType.h b/fofi/FoFiTrueType.h
index af6dac2..22a92f1 100644
--- a/fofi/FoFiTrueType.h
+++ b/fofi/FoFiTrueType.h
@@ -9,6 +9,8 @@
 #ifndef FOFITRUETYPE_H
 #define FOFITRUETYPE_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -25,7 +27,7 @@ struct TrueTypeCmap;
 // FoFiTrueType
 //------------------------------------------------------------------------
 
-class FoFiTrueType: public FoFiBase {
+class poppler_EXPORT FoFiTrueType: public FoFiBase {
 public:
 
   // Create a FoFiTrueType object from a memory buffer.
diff --git a/fofi/FoFiType1.h b/fofi/FoFiType1.h
index 85e67b1..109c89a 100644
--- a/fofi/FoFiType1.h
+++ b/fofi/FoFiType1.h
@@ -9,6 +9,8 @@
 #ifndef FOFITYPE1_H
 #define FOFITYPE1_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -20,7 +22,7 @@
 // FoFiType1
 //------------------------------------------------------------------------
 
-class FoFiType1: public FoFiBase {
+class poppler_EXPORT FoFiType1: public FoFiBase {
 public:
 
   // Create a FoFiType1 object from a memory buffer.
diff --git a/fofi/FoFiType1C.h b/fofi/FoFiType1C.h
index 4960e78..29a2bf3 100644
--- a/fofi/FoFiType1C.h
+++ b/fofi/FoFiType1C.h
@@ -9,6 +9,8 @@
 #ifndef FOFITYPE1C_H
 #define FOFITYPE1C_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -129,7 +131,7 @@ struct Type1CEexecBuf {
 // FoFiType1C
 //------------------------------------------------------------------------
 
-class FoFiType1C: public FoFiBase {
+class poppler_EXPORT FoFiType1C: public FoFiBase {
 public:
 
   // Create a FoFiType1C object from a memory buffer.
diff --git a/goo/FixedPoint.h b/goo/FixedPoint.h
index babcb81..a08c764 100644
--- a/goo/FixedPoint.h
+++ b/goo/FixedPoint.h
@@ -11,6 +11,8 @@
 #ifndef FIXEDPOINT_H
 #define FIXEDPOINT_H
 
+#include <poppler/poppler-export.h>
+
 #include <poppler/poppler-config.h>
 
 #if USE_FIXEDPOINT
@@ -29,7 +31,7 @@
 
 typedef long long FixPtInt64;
 
-class FixedPoint {
+class poppler_EXPORT FixedPoint {
 public:
 
   FixedPoint() { val = 0; }
diff --git a/goo/GooHash.h b/goo/GooHash.h
index bdcf1c4..135406e 100644
--- a/goo/GooHash.h
+++ b/goo/GooHash.h
@@ -9,6 +9,8 @@
 #ifndef GHASH_H
 #define GHASH_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -21,7 +23,7 @@ struct GooHashIter;
 
 //------------------------------------------------------------------------
 
-class GooHash {
+class poppler_EXPORT GooHash {
 public:
 
   GooHash(GBool deleteKeysA = gFalse);
diff --git a/goo/GooList.h b/goo/GooList.h
index 576f3e8..72ee17d 100644
--- a/goo/GooList.h
+++ b/goo/GooList.h
@@ -9,6 +9,8 @@
 #ifndef GLIST_H
 #define GLIST_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -19,7 +21,7 @@
 // GooList
 //------------------------------------------------------------------------
 
-class GooList {
+class poppler_EXPORT GooList {
 public:
 
   // Create an empty list.
diff --git a/goo/GooString.h b/goo/GooString.h
index e0620bd..e847605 100644
--- a/goo/GooString.h
+++ b/goo/GooString.h
@@ -11,6 +11,8 @@
 #ifndef GooString_H
 #define GooString_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -19,7 +21,7 @@
 #include <stdlib.h> // for NULL
 #include "gtypes.h"
 
-class GooString {
+class poppler_EXPORT GooString {
 public:
 
   // Create an empty string.
diff --git a/goo/GooTimer.h b/goo/GooTimer.h
index f454e2a..fd9efaa 100755
--- a/goo/GooTimer.h
+++ b/goo/GooTimer.h
@@ -9,6 +9,8 @@
 #ifndef GOOTIMER_H
 #define GOOTIMER_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -26,7 +28,7 @@
 // GooTimer
 //------------------------------------------------------------------------
 
-class GooTimer {
+class poppler_EXPORT GooTimer {
 public:
 
   // Create a new timer.
diff --git a/goo/gfile.h b/goo/gfile.h
index ce50562..c64384f 100644
--- a/goo/gfile.h
+++ b/goo/gfile.h
@@ -48,6 +48,8 @@ extern "C" {
 #  endif
 #endif
 }
+#include <poppler/poppler-export.h>
+
 #include "gtypes.h"
 
 class GooString;
@@ -55,29 +57,29 @@ class GooString;
 //------------------------------------------------------------------------
 
 // Get home directory path.
-extern GooString *getHomeDir();
+extern poppler_EXPORT GooString *getHomeDir();
 
 // Get current directory.
-extern GooString *getCurrentDir();
+extern poppler_EXPORT GooString *getCurrentDir();
 
 // Append a file name to a path string.  <path> may be an empty
 // string, denoting the current directory).  Returns <path>.
-extern GooString *appendToPath(GooString *path, char *fileName);
+extern poppler_EXPORT GooString *appendToPath(GooString *path, char *fileName);
 
 // Grab the path from the front of the file name.  If there is no
 // directory component in <fileName>, returns an empty string.
-extern GooString *grabPath(char *fileName);
+extern poppler_EXPORT GooString *grabPath(char *fileName);
 
 // Is this an absolute path or file name?
-extern GBool isAbsolutePath(char *path);
+extern poppler_EXPORT GBool isAbsolutePath(char *path);
 
 // Make this path absolute by prepending current directory (if path is
 // relative) or prepending user's directory (if path starts with '~').
-extern GooString *makePathAbsolute(GooString *path);
+extern poppler_EXPORT GooString *makePathAbsolute(GooString *path);
 
 // Get the modification time for <fileName>.  Returns 0 if there is an
 // error.
-extern time_t getModTime(char *fileName);
+extern poppler_EXPORT time_t getModTime(char *fileName);
 
 // Create a temporary file and open it for writing.  If <ext> is not
 // NULL, it will be used as the file name extension.  Returns both the
@@ -85,20 +87,20 @@ extern time_t getModTime(char *fileName);
 // should be done to the returned file pointer; the file may be
 // reopened later for reading, but not for writing.  The <mode> string
 // should be "w" or "wb".  Returns true on success.
-extern GBool openTempFile(GooString **name, FILE **f, char *mode, char *ext);
+extern poppler_EXPORT GBool openTempFile(GooString **name, FILE **f, char *mode, char *ext);
 
 // Execute <command>.  Returns true on success.
-extern GBool executeCommand(char *cmd);
+extern poppler_EXPORT GBool executeCommand(char *cmd);
 
 // Just like fgets, but handles Unix, Mac, and/or DOS end-of-line
 // conventions.
-extern char *getLine(char *buf, int size, FILE *f);
+extern poppler_EXPORT char *getLine(char *buf, int size, FILE *f);
 
 //------------------------------------------------------------------------
 // GDir and GDirEntry
 //------------------------------------------------------------------------
 
-class GDirEntry {
+class poppler_EXPORT GDirEntry {
 public:
 
   GDirEntry(char *dirPath, char *nameA, GBool doStat);
@@ -114,7 +116,7 @@ private:
   GBool dir;			// is it a directory?
 };
 
-class GDir {
+class poppler_EXPORT GDir {
 public:
 
   GDir(char *name, GBool doStatA = gTrue);
diff --git a/goo/gmem.h b/goo/gmem.h
index b1d175d..708054b 100644
--- a/goo/gmem.h
+++ b/goo/gmem.h
@@ -9,12 +9,14 @@
 #ifndef GMEM_H
 #define GMEM_H
 
+#include <poppler/poppler-export.h>
+
 #include <stdio.h>
 #include <poppler/poppler-config.h>
 
 #if USE_EXCEPTIONS
 
-class GMemException {
+class poppler_EXPORT GMemException {
 public:
   GMemException() {}
   ~GMemException() {}
@@ -36,13 +38,13 @@ extern "C" {
  * Same as malloc, but prints error message and exits if malloc()
  * returns NULL.
  */
-extern void *gmalloc(size_t size) GMEM_EXCEP;
+extern poppler_EXPORT void *gmalloc(size_t size) GMEM_EXCEP;
 
 /*
  * Same as realloc, but prints error message and exits if realloc()
  * returns NULL.  If <p> is NULL, calls malloc instead of realloc().
  */
-extern void *grealloc(void *p, size_t size) GMEM_EXCEP;
+extern poppler_EXPORT void *grealloc(void *p, size_t size) GMEM_EXCEP;
 
 /*
  * These are similar to gmalloc and grealloc, but take an object count
@@ -52,20 +54,20 @@ extern void *grealloc(void *p, size_t size) GMEM_EXCEP;
  * The gmallocn_checkoverflow variant returns NULL instead of exiting
  * the application if a overflow is detected
  */
-extern void *gmallocn(int nObjs, int objSize) GMEM_EXCEP;
-extern void *gmallocn_checkoverflow(int nObjs, int objSize) GMEM_EXCEP;
-extern void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP;
+extern poppler_EXPORT void *gmallocn(int nObjs, int objSize) GMEM_EXCEP;
+extern poppler_EXPORT void *gmallocn_checkoverflow(int nObjs, int objSize) GMEM_EXCEP;
+extern poppler_EXPORT void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP;
 
 /*
  * Same as free, but checks for and ignores NULL pointers.
  */
-extern void gfree(void *p);
+extern poppler_EXPORT void gfree(void *p);
 
 #ifdef DEBUG_MEM
 /*
  * Report on unfreed memory.
  */
-extern void gMemReport(FILE *f);
+extern poppler_EXPORT void gMemReport(FILE *f);
 #else
 #define gMemReport(f)
 #endif
@@ -73,7 +75,7 @@ extern void gMemReport(FILE *f);
 /*
  * Allocate memory and copy a string into it.
  */
-extern char *copyString(char *s);
+extern poppler_EXPORT char *copyString(char *s);
 
 /*
  * Allocate memory and copy a limited-length string to it.
diff --git a/poppler/ABWOutputDev.h b/poppler/ABWOutputDev.h
index 0ea8807..aa931a0 100644
--- a/poppler/ABWOutputDev.h
+++ b/poppler/ABWOutputDev.h
@@ -9,6 +9,8 @@
 #ifndef ABWOUTPUTDEV_H
 #define ABWOUTPUTDEV_H
 
+#include "poppler-export.h"
+
 #ifdef __GNUC__
 #pragma interface
 #endif
@@ -42,7 +44,7 @@ class GooString;
 // ABWOutputDev
 //------------------------------------------------------------------------
 
-class ABWOutputDev: public OutputDev {
+class poppler_EXPORT ABWOutputDev: public OutputDev {
 public:
 
   // Open a text output file.  If <fileName> is NULL, no file is written
diff --git a/poppler/Annot.h b/poppler/Annot.h
index d9cc039..bf1e204 100644
--- a/poppler/Annot.h
+++ b/poppler/Annot.h
@@ -9,6 +9,8 @@
 #ifndef ANNOT_H
 #define ANNOT_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -268,7 +270,7 @@ enum AnnotBorderType {
   annotBorderUnderlined
 };
 
-class AnnotBorderStyle {
+class poppler_EXPORT AnnotBorderStyle {
 public:
 
   AnnotBorderStyle(AnnotBorderType typeA, double widthA,
@@ -392,7 +394,7 @@ protected:
 // Annot
 //------------------------------------------------------------------------
 
-class Annot {
+class poppler_EXPORT Annot {
 public:
   enum AnnotFlag {
     flagUnknown        = 0x0000,
@@ -844,7 +846,7 @@ protected:
 // Annots
 //------------------------------------------------------------------------
 
-class Annots {
+class poppler_EXPORT Annots {
 public:
 
   // Build a list of Annot objects.
diff --git a/poppler/Array.h b/poppler/Array.h
index a628330..8d970a5 100644
--- a/poppler/Array.h
+++ b/poppler/Array.h
@@ -9,6 +9,8 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -21,7 +23,7 @@ class XRef;
 // Array
 //------------------------------------------------------------------------
 
-class Array {
+class poppler_EXPORT Array {
 public:
 
   // Constructor.
diff --git a/poppler/ArthurOutputDev.h b/poppler/ArthurOutputDev.h
index f71806f..5ce42a1 100644
--- a/poppler/ArthurOutputDev.h
+++ b/poppler/ArthurOutputDev.h
@@ -10,6 +10,8 @@
 #ifndef ARTHUROUTPUTDEV_H
 #define ARTHUROUTPUTDEV_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -32,8 +34,11 @@ class SplashGlyphBitmap;
 //------------------------------------------------------------------------
 // ArthurOutputDev - Qt 4 QPainter renderer
 //------------------------------------------------------------------------
+#if defined (poppler_qt4_EXPORTS) && defined(_WIN32) 
+#define poppler_EXPORT poppler_qt4_EXPORT
+#endif
 
-class ArthurOutputDev: public OutputDev {
+class poppler_EXPORT ArthurOutputDev: public OutputDev {
 public:
 
   // Constructor.
diff --git a/poppler/BuiltinFont.h b/poppler/BuiltinFont.h
index 8652034..1086b75 100644
--- a/poppler/BuiltinFont.h
+++ b/poppler/BuiltinFont.h
@@ -9,6 +9,8 @@
 #ifndef BUILTINFONT_H
 #define BUILTINFONT_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -37,7 +39,7 @@ struct BuiltinFontWidth {
   BuiltinFontWidth *next;
 };
 
-class BuiltinFontWidths {
+class poppler_EXPORT BuiltinFontWidths {
 public:
 
   BuiltinFontWidths(BuiltinFontWidth *widths, int sizeA);
diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h
index b8af716..d706cbd 100644
--- a/poppler/CairoFontEngine.h
+++ b/poppler/CairoFontEngine.h
@@ -7,6 +7,8 @@
 #ifndef CAIROFONTENGINE_H
 #define CAIROFONTENGINE_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -16,7 +18,7 @@
 
 #include "GfxFont.h"
 
-class CairoFont {
+class poppler_EXPORT CairoFont {
 public:
   static CairoFont *create(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs);
   ~CairoFont();
@@ -48,7 +50,7 @@ private:
 // CairoFontEngine
 //------------------------------------------------------------------------
 
-class CairoFontEngine {
+class poppler_EXPORT CairoFontEngine {
 public:
 
   // Create a font engine.
diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h
index 5d2b658..8452cb0 100644
--- a/poppler/CairoOutputDev.h
+++ b/poppler/CairoOutputDev.h
@@ -10,6 +10,8 @@
 #ifndef CAIROOUTPUTDEV_H
 #define CAIROOUTPUTDEV_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -31,7 +33,7 @@ class CairoFont;
 //------------------------------------------------------------------------
 // CairoImage
 //------------------------------------------------------------------------
-class CairoImage {
+class poppler_EXPORT CairoImage {
 public:
   // Constructor.
   CairoImage (double x1, double y1, double x2, double y2);
@@ -60,7 +62,7 @@ private:
 // CairoOutputDev
 //------------------------------------------------------------------------
 
-class CairoOutputDev: public OutputDev {
+class poppler_EXPORT CairoOutputDev: public OutputDev {
 public:
 
   // Constructor.
@@ -237,7 +239,7 @@ protected:
 //------------------------------------------------------------------------
 
 //XXX: this should ideally not inherit from CairoOutputDev but use it instead perhaps
-class CairoImageOutputDev: public CairoOutputDev {
+class poppler_EXPORT CairoImageOutputDev: public CairoOutputDev {
 public:
 
   // Constructor.
diff --git a/poppler/Catalog.h b/poppler/Catalog.h
index bd49189..4c6c085 100644
--- a/poppler/Catalog.h
+++ b/poppler/Catalog.h
@@ -9,6 +9,8 @@
 #ifndef CATALOG_H
 #define CATALOG_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -26,7 +28,7 @@ class Form;
 // NameTree
 //------------------------------------------------------------------------
 
-class NameTree {
+class poppler_EXPORT NameTree {
 public:
   NameTree();
   void init(XRef *xref, Object *tree);
@@ -58,7 +60,7 @@ private:
                     // length is the number of real Entry
 };
 
-class EmbFile {
+class poppler_EXPORT EmbFile {
 public:
   EmbFile(GooString *name, GooString *description, 
 	  int size,
@@ -107,7 +109,7 @@ private:
 // Catalog
 //------------------------------------------------------------------------
 
-class Catalog {
+class poppler_EXPORT Catalog {
 public:
 
   // Constructor.
diff --git a/poppler/CharCodeToUnicode.h b/poppler/CharCodeToUnicode.h
index f3b2173..3ee452d 100644
--- a/poppler/CharCodeToUnicode.h
+++ b/poppler/CharCodeToUnicode.h
@@ -11,6 +11,8 @@
 #ifndef CHARCODETOUNICODE_H
 #define CHARCODETOUNICODE_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -26,7 +28,7 @@ struct CharCodeToUnicodeString;
 
 //------------------------------------------------------------------------
 
-class CharCodeToUnicode {
+class poppler_EXPORT CharCodeToUnicode {
 friend class UnicodeToCharCode;
 public:
 
@@ -97,7 +99,7 @@ private:
 
 //------------------------------------------------------------------------
 
-class CharCodeToUnicodeCache {
+class poppler_EXPORT CharCodeToUnicodeCache {
 public:
 
   CharCodeToUnicodeCache(int sizeA);
diff --git a/poppler/DCTStream.cc b/poppler/DCTStream.cc
index b568ca5..9ca7034 100644
--- a/poppler/DCTStream.cc
+++ b/poppler/DCTStream.cc
@@ -184,3 +184,7 @@ GooString *DCTStream::getPSFilter(int psLevel, char *indent) {
 GBool DCTStream::isBinary(GBool last) {
   return str->isBinary(gTrue);
 }
+
+void DCTStream::close() {
+str->close();
+}
\ No newline at end of file
diff --git a/poppler/DCTStream.h b/poppler/DCTStream.h
index dbab9b7..b168910 100644
--- a/poppler/DCTStream.h
+++ b/poppler/DCTStream.h
@@ -10,6 +10,8 @@
 #define DCTSTREAM_H
 #include <config.h>
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -48,13 +50,14 @@ struct str_src_mgr {
 };
 
 
-class DCTStream: public FilterStream {
+class poppler_EXPORT DCTStream: public FilterStream {
 public:
 
   DCTStream(Stream *strA, int colorXformA);
   virtual ~DCTStream();
   virtual StreamKind getKind() { return strDCT; }
   virtual void reset();
+  virtual void close();
   virtual int getChar();
   virtual int lookChar();
   virtual GooString *getPSFilter(int psLevel, char *indent);
diff --git a/poppler/Decrypt.h b/poppler/Decrypt.h
index b861968..5395f35 100644
--- a/poppler/Decrypt.h
+++ b/poppler/Decrypt.h
@@ -9,6 +9,8 @@
 #ifndef DECRYPT_H
 #define DECRYPT_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -22,7 +24,7 @@
 // Decrypt
 //------------------------------------------------------------------------
 
-class Decrypt {
+class poppler_EXPORT Decrypt {
 public:
   static void md5(Guchar *msg, int msgLen, Guchar *digest);
 
@@ -65,7 +67,7 @@ struct DecryptAESState {
   int bufIdx;
 };
 
-class DecryptStream: public FilterStream {
+class poppler_EXPORT DecryptStream: public FilterStream {
 public:
 
   DecryptStream(Stream *strA, Guchar *fileKey,
diff --git a/poppler/Dict.h b/poppler/Dict.h
index badb6b5..1d21cf4 100644
--- a/poppler/Dict.h
+++ b/poppler/Dict.h
@@ -9,6 +9,8 @@
 #ifndef DICT_H
 #define DICT_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -24,7 +26,7 @@ struct DictEntry {
   Object val;
 };
 
-class Dict {
+class poppler_EXPORT Dict {
 public:
 
   // Constructor.
diff --git a/poppler/Error.h b/poppler/Error.h
index 0f780c9..d00cb44 100644
--- a/poppler/Error.h
+++ b/poppler/Error.h
@@ -9,6 +9,8 @@
 #ifndef ERROR_H
 #define ERROR_H
 
+#include <poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -16,7 +18,7 @@
 #include <stdarg.h>
 #include "poppler-config.h"
 
-extern void CDECL error(int pos, char *msg, ...) GCC_PRINTF_FORMAT (2, 3);
+extern poppler_EXPORT void CDECL error(int pos, char *msg, ...) GCC_PRINTF_FORMAT (2, 3);
 void warning(char *msg, ...) GCC_PRINTF_FORMAT (1, 2);
 
 void setErrorFunction(void (* f)(int , char *, va_list args));
diff --git a/poppler/FlateStream.h b/poppler/FlateStream.h
index ede7984..71dc722 100644
--- a/poppler/FlateStream.h
+++ b/poppler/FlateStream.h
@@ -10,6 +10,8 @@
 #define FLATESTREAM_H
 #include <config.h>
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -39,7 +41,7 @@ extern "C" {
 #include <zlib.h>
 }
 
-class FlateStream: public FilterStream {
+class poppler_EXPORT FlateStream: public FilterStream {
 public:
 
   FlateStream(Stream *strA, int predictor, int columns, int colors, int bits);
diff --git a/poppler/FontInfo.h b/poppler/FontInfo.h
index 81bf4b9..fe72f35 100644
--- a/poppler/FontInfo.h
+++ b/poppler/FontInfo.h
@@ -1,10 +1,12 @@
 #ifndef FONT_INFO_H
 #define FONT_INFO_H
 
+#include "poppler-export.h"
+
 #include "goo/gtypes.h"
 #include "goo/GooList.h"
 
-class FontInfo {
+class poppler_EXPORT FontInfo {
 public:
   enum Type {
     unknown,
@@ -45,7 +47,7 @@ private:
   Ref fontRef;
 };
 
-class FontInfoScanner {
+class poppler_EXPORT FontInfoScanner {
 public:
 
   // Constructor.
diff --git a/poppler/Form.h b/poppler/Form.h
index 4cac8d8..9e47907 100644
--- a/poppler/Form.h
+++ b/poppler/Form.h
@@ -9,6 +9,8 @@
 #ifndef FORM_H
 #define FORM_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -49,7 +51,7 @@ class FormFieldChoice;
 // to a page.
 //------------------------------------------------------------------------
 
-class FormWidget {
+class poppler_EXPORT FormWidget {
 public:
   virtual ~FormWidget();
 
@@ -121,7 +123,7 @@ protected:
 // FormWidgetButton
 //------------------------------------------------------------------------
 
-class FormWidgetButton: public FormWidget {
+class poppler_EXPORT FormWidgetButton: public FormWidget {
 public:
   FormWidgetButton(XRef *xrefA, Object *dict, unsigned num, Ref ref, FormFieldButton *p);
   ~FormWidgetButton ();
@@ -157,7 +159,7 @@ protected:
 // FormWidgetText
 //------------------------------------------------------------------------
 
-class FormWidgetText: public FormWidget {
+class poppler_EXPORT FormWidgetText: public FormWidget {
 public:
   FormWidgetText(XRef *xrefA, Object *dict, unsigned num, Ref ref, FormFieldText *p);
   //return the field's content (UTF16BE)
@@ -187,7 +189,7 @@ protected:
 // FormWidgetChoice
 //------------------------------------------------------------------------
 
-class FormWidgetChoice: public FormWidget {
+class poppler_EXPORT FormWidgetChoice: public FormWidget {
 public:
   FormWidgetChoice(XRef *xrefA, Object *dict, unsigned num, Ref ref, FormFieldChoice *p);
   ~FormWidgetChoice();
@@ -230,7 +232,7 @@ protected:
 // FormWidgetSignature
 //------------------------------------------------------------------------
 
-class FormWidgetSignature: public FormWidget {
+class poppler_EXPORT FormWidgetSignature: public FormWidget {
 public:
   FormWidgetSignature(XRef *xrefA, Object *dict, unsigned num, Ref ref, FormFieldSignature *p);
   bool isReadOnly () const;
@@ -245,7 +247,7 @@ protected:
 // only interact with FormWidgets.
 //------------------------------------------------------------------------
 
-class FormField {
+class poppler_EXPORT FormField {
 public:
   FormField(XRef* xrefa, Object *aobj, const Ref& aref, Form* aform, FormFieldType t=formUndef);
 
@@ -291,7 +293,7 @@ private:
 // FormFieldButton
 //------------------------------------------------------------------------
 
-class FormFieldButton: public FormField {
+class poppler_EXPORT FormFieldButton: public FormField {
 public:
   FormFieldButton(XRef *xrefA, Object *dict, const Ref& ref, Form* form);
 
@@ -316,7 +318,7 @@ protected:
 // FormFieldText
 //------------------------------------------------------------------------
 
-class FormFieldText: public FormField {
+class poppler_EXPORT FormFieldText: public FormField {
 public:
   FormFieldText(XRef *xrefA, Object *dict, const Ref& ref, Form* form);
   
@@ -350,7 +352,7 @@ protected:
 // FormFieldChoice
 //------------------------------------------------------------------------
 
-class FormFieldChoice: public FormField {
+class poppler_EXPORT FormFieldChoice: public FormField {
 public:
   FormFieldChoice(XRef *xrefA, Object *aobj, const Ref& ref, Form* form);
 
@@ -413,7 +415,7 @@ protected:
 // FormFieldSignature
 //------------------------------------------------------------------------
 
-class FormFieldSignature: public FormField {
+class poppler_EXPORT FormFieldSignature: public FormField {
 public:
   FormFieldSignature(XRef *xrefA, Object *dict, const Ref& ref, Form* form);
 
@@ -426,7 +428,7 @@ public:
 // Catalog entry).
 //------------------------------------------------------------------------
 
-class Form {
+class poppler_EXPORT Form {
 public:
   Form(XRef *xrefA, Object* acroForm);
 
@@ -456,7 +458,7 @@ private:
 // FormPageWidgets
 //------------------------------------------------------------------------
 
-class FormPageWidgets {
+class poppler_EXPORT FormPageWidgets {
 public:
   FormPageWidgets (XRef *xrefA, Object* annots, unsigned int page, Form *form);
   ~FormPageWidgets();
diff --git a/poppler/Function.h b/poppler/Function.h
index d16873d..b73b11f 100644
--- a/poppler/Function.h
+++ b/poppler/Function.h
@@ -9,6 +9,8 @@
 #ifndef FUNCTION_H
 #define FUNCTION_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -29,7 +31,7 @@ class PSStack;
 #define funcMaxOutputs       32
 #define sampledFuncMaxInputs 16
 
-class Function {
+class poppler_EXPORT Function {
 public:
 
   Function();
@@ -81,7 +83,7 @@ protected:
 // IdentityFunction
 //------------------------------------------------------------------------
 
-class IdentityFunction: public Function {
+class poppler_EXPORT IdentityFunction: public Function {
 public:
 
   IdentityFunction();
@@ -98,7 +100,7 @@ private:
 // SampledFunction
 //------------------------------------------------------------------------
 
-class SampledFunction: public Function {
+class poppler_EXPORT SampledFunction: public Function {
 public:
 
   SampledFunction(Object *funcObj, Dict *dict);
@@ -138,7 +140,7 @@ private:
 // ExponentialFunction
 //------------------------------------------------------------------------
 
-class ExponentialFunction: public Function {
+class poppler_EXPORT ExponentialFunction: public Function {
 public:
 
   ExponentialFunction(Object *funcObj, Dict *dict);
@@ -166,7 +168,7 @@ private:
 // StitchingFunction
 //------------------------------------------------------------------------
 
-class StitchingFunction: public Function {
+class poppler_EXPORT StitchingFunction: public Function {
 public:
 
   StitchingFunction(Object *funcObj, Dict *dict);
@@ -198,7 +200,7 @@ private:
 // PostScriptFunction
 //------------------------------------------------------------------------
 
-class PostScriptFunction: public Function {
+class poppler_EXPORT PostScriptFunction: public Function {
 public:
 
   PostScriptFunction(Object *funcObj, Dict *dict);
diff --git a/poppler/Gfx.h b/poppler/Gfx.h
index 2c86105..63736e1 100644
--- a/poppler/Gfx.h
+++ b/poppler/Gfx.h
@@ -9,6 +9,8 @@
 #ifndef GFX_H
 #define GFX_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -75,7 +77,7 @@ struct Operator {
 
 //------------------------------------------------------------------------
 
-class GfxResources {
+class poppler_EXPORT GfxResources {
 public:
 
   GfxResources(XRef *xref, Dict *resDict, GfxResources *nextA);
@@ -106,7 +108,7 @@ private:
 // Gfx
 //------------------------------------------------------------------------
 
-class Gfx {
+class poppler_EXPORT Gfx {
 public:
 
   // Constructor for regular output.
diff --git a/poppler/GfxFont.h b/poppler/GfxFont.h
index 54de675..04667ca 100644
--- a/poppler/GfxFont.h
+++ b/poppler/GfxFont.h
@@ -9,6 +9,8 @@
 #ifndef GFXFONT_H
 #define GFXFONT_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -84,7 +86,7 @@ struct GfxFontCIDWidths {
 #define fontItalic     (1 << 6)
 #define fontBold       (1 << 18)
 
-class GfxFont {
+class poppler_EXPORT GfxFont {
 public:
 
   enum Stretch { 
@@ -240,7 +242,7 @@ protected:
 // Gfx8BitFont
 //------------------------------------------------------------------------
 
-class Gfx8BitFont: public GfxFont {
+class poppler_EXPORT Gfx8BitFont: public GfxFont {
 public:
 
   Gfx8BitFont(XRef *xref, char *tagA, Ref idA, GooString *nameA,
@@ -300,7 +302,7 @@ private:
 // GfxCIDFont
 //------------------------------------------------------------------------
 
-class GfxCIDFont: public GfxFont {
+class poppler_EXPORT GfxCIDFont: public GfxFont {
 public:
 
   GfxCIDFont(XRef *xref, char *tagA, Ref idA, GooString *nameA,
@@ -348,7 +350,7 @@ private:
 // GfxFontDict
 //------------------------------------------------------------------------
 
-class GfxFontDict {
+class poppler_EXPORT GfxFontDict {
 public:
 
   // Build the font dictionary, given the PDF font dictionary.
diff --git a/poppler/GfxState.h b/poppler/GfxState.h
index c766858..e91767c 100644
--- a/poppler/GfxState.h
+++ b/poppler/GfxState.h
@@ -9,6 +9,8 @@
 #ifndef GFXSTATE_H
 #define GFXSTATE_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -22,7 +24,7 @@ class GfxFont;
 class PDFRectangle;
 class GfxShading;
 
-class Matrix {
+class poppler_EXPORT Matrix {
 public:
   double m[6];
 
@@ -135,7 +137,7 @@ enum GfxColorSpaceMode {
   csPattern
 };
 
-class GfxColorSpace {
+class poppler_EXPORT GfxColorSpace {
 public:
 
   GfxColorSpace();
@@ -181,7 +183,7 @@ private:
 // GfxDeviceGrayColorSpace
 //------------------------------------------------------------------------
 
-class GfxDeviceGrayColorSpace: public GfxColorSpace {
+class poppler_EXPORT GfxDeviceGrayColorSpace: public GfxColorSpace {
 public:
 
   GfxDeviceGrayColorSpace();
@@ -205,7 +207,7 @@ private:
 // GfxCalGrayColorSpace
 //------------------------------------------------------------------------
 
-class GfxCalGrayColorSpace: public GfxColorSpace {
+class poppler_EXPORT GfxCalGrayColorSpace: public GfxColorSpace {
 public:
 
   GfxCalGrayColorSpace();
@@ -245,7 +247,7 @@ private:
 // GfxDeviceRGBColorSpace
 //------------------------------------------------------------------------
 
-class GfxDeviceRGBColorSpace: public GfxColorSpace {
+class poppler_EXPORT GfxDeviceRGBColorSpace: public GfxColorSpace {
 public:
 
   GfxDeviceRGBColorSpace();
@@ -269,7 +271,7 @@ private:
 // GfxCalRGBColorSpace
 //------------------------------------------------------------------------
 
-class GfxCalRGBColorSpace: public GfxColorSpace {
+class poppler_EXPORT GfxCalRGBColorSpace: public GfxColorSpace {
 public:
 
   GfxCalRGBColorSpace();
@@ -313,7 +315,7 @@ private:
 // GfxDeviceCMYKColorSpace
 //------------------------------------------------------------------------
 
-class GfxDeviceCMYKColorSpace: public GfxColorSpace {
+class poppler_EXPORT GfxDeviceCMYKColorSpace: public GfxColorSpace {
 public:
 
   GfxDeviceCMYKColorSpace();
@@ -335,7 +337,7 @@ private:
 // GfxLabColorSpace
 //------------------------------------------------------------------------
 
-class GfxLabColorSpace: public GfxColorSpace {
+class poppler_EXPORT GfxLabColorSpace: public GfxColorSpace {
 public:
 
   GfxLabColorSpace();
@@ -380,7 +382,7 @@ private:
 // GfxICCBasedColorSpace
 //------------------------------------------------------------------------
 
-class GfxICCBasedColorSpace: public GfxColorSpace {
+class poppler_EXPORT GfxICCBasedColorSpace: public GfxColorSpace {
 public:
 
   GfxICCBasedColorSpace(int nCompsA, GfxColorSpace *altA,
@@ -419,7 +421,7 @@ private:
 // GfxIndexedColorSpace
 //------------------------------------------------------------------------
 
-class GfxIndexedColorSpace: public GfxColorSpace {
+class poppler_EXPORT GfxIndexedColorSpace: public GfxColorSpace {
 public:
 
   GfxIndexedColorSpace(GfxColorSpace *baseA, int indexHighA);
@@ -458,7 +460,7 @@ private:
 // GfxSeparationColorSpace
 //------------------------------------------------------------------------
 
-class GfxSeparationColorSpace: public GfxColorSpace {
+class poppler_EXPORT GfxSeparationColorSpace: public GfxColorSpace {
 public:
 
   GfxSeparationColorSpace(GooString *nameA, GfxColorSpace *altA,
@@ -496,7 +498,7 @@ private:
 // GfxDeviceNColorSpace
 //------------------------------------------------------------------------
 
-class GfxDeviceNColorSpace: public GfxColorSpace {
+class poppler_EXPORT GfxDeviceNColorSpace: public GfxColorSpace {
 public:
 
   GfxDeviceNColorSpace(int nCompsA, GfxColorSpace *alt, Function *func);
@@ -535,7 +537,7 @@ private:
 // GfxPatternColorSpace
 //------------------------------------------------------------------------
 
-class GfxPatternColorSpace: public GfxColorSpace {
+class poppler_EXPORT GfxPatternColorSpace: public GfxColorSpace {
 public:
 
   GfxPatternColorSpace(GfxColorSpace *underA);
@@ -566,7 +568,7 @@ private:
 // GfxPattern
 //------------------------------------------------------------------------
 
-class GfxPattern {
+class poppler_EXPORT GfxPattern {
 public:
 
   GfxPattern(int typeA);
@@ -587,7 +589,7 @@ private:
 // GfxTilingPattern
 //------------------------------------------------------------------------
 
-class GfxTilingPattern: public GfxPattern {
+class poppler_EXPORT GfxTilingPattern: public GfxPattern {
 public:
 
   static GfxTilingPattern *parse(Object *patObj);
@@ -625,7 +627,7 @@ private:
 // GfxShadingPattern
 //------------------------------------------------------------------------
 
-class GfxShadingPattern: public GfxPattern {
+class poppler_EXPORT GfxShadingPattern: public GfxPattern {
 public:
 
   static GfxShadingPattern *parse(Object *patObj);
@@ -648,7 +650,7 @@ private:
 // GfxShading
 //------------------------------------------------------------------------
 
-class GfxShading {
+class poppler_EXPORT GfxShading {
 public:
 
   GfxShading(int typeA);
@@ -683,7 +685,7 @@ protected:
 // GfxFunctionShading
 //------------------------------------------------------------------------
 
-class GfxFunctionShading: public GfxShading {
+class poppler_EXPORT GfxFunctionShading: public GfxShading {
 public:
 
   GfxFunctionShading(double x0A, double y0A,
@@ -716,7 +718,7 @@ private:
 // GfxAxialShading
 //------------------------------------------------------------------------
 
-class GfxAxialShading: public GfxShading {
+class poppler_EXPORT GfxAxialShading: public GfxShading {
 public:
 
   GfxAxialShading(double x0A, double y0A,
@@ -754,7 +756,7 @@ private:
 // GfxRadialShading
 //------------------------------------------------------------------------
 
-class GfxRadialShading: public GfxShading {
+class poppler_EXPORT GfxRadialShading: public GfxShading {
 public:
 
   GfxRadialShading(double x0A, double y0A, double r0A,
@@ -798,7 +800,7 @@ struct GfxGouraudVertex {
   GfxColor color;
 };
 
-class GfxGouraudTriangleShading: public GfxShading {
+class poppler_EXPORT GfxGouraudTriangleShading: public GfxShading {
 public:
 
   GfxGouraudTriangleShading(int typeA,
@@ -837,7 +839,7 @@ struct GfxPatch {
   GfxColor color[2][2];
 };
 
-class GfxPatchMeshShading: public GfxShading {
+class poppler_EXPORT GfxPatchMeshShading: public GfxShading {
 public:
 
   GfxPatchMeshShading(int typeA, GfxPatch *patchesA, int nPatchesA,
@@ -864,7 +866,7 @@ private:
 // GfxImageColorMap
 //------------------------------------------------------------------------
 
-class GfxImageColorMap {
+class poppler_EXPORT GfxImageColorMap {
 public:
 
   // Constructor.
@@ -922,7 +924,7 @@ private:
 // GfxSubpath and GfxPath
 //------------------------------------------------------------------------
 
-class GfxSubpath {
+class poppler_EXPORT GfxSubpath {
 public:
 
   // Constructor.
@@ -970,7 +972,7 @@ private:
   GfxSubpath(GfxSubpath *subpath);
 };
 
-class GfxPath {
+class poppler_EXPORT GfxPath {
 public:
 
   // Constructor.
@@ -1032,7 +1034,7 @@ private:
 // GfxState
 //------------------------------------------------------------------------
 
-class GfxState {
+class poppler_EXPORT GfxState {
 public:
 
   // Construct a default GfxState, for a device with resolution <hDPI>
diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h
index d505d74..6e6ea49 100644
--- a/poppler/GlobalParams.h
+++ b/poppler/GlobalParams.h
@@ -9,6 +9,8 @@
 #ifndef GLOBALPARAMS_H
 #define GLOBALPARAMS_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -46,7 +48,7 @@ class WinFontList;
 //------------------------------------------------------------------------
 
 // The global parameters object.
-extern GlobalParams *globalParams;
+extern poppler_EXPORT GlobalParams *globalParams;
 
 //------------------------------------------------------------------------
 
@@ -64,7 +66,7 @@ struct DisplayFontParamTT {
   int faceIndex;
 };
 
-class DisplayFontParam {
+class poppler_EXPORT DisplayFontParam {
 public:
 
   GooString *name;		// font name for 8-bit fonts and named
@@ -90,7 +92,7 @@ public:
 
 //------------------------------------------------------------------------
 
-class PSFontParam {
+class poppler_EXPORT PSFontParam {
 public:
 
   GooString *pdfFontName;		// PDF font name for 8-bit fonts and
@@ -136,7 +138,7 @@ enum ScreenType {
 
 //------------------------------------------------------------------------
 
-class GlobalParams {
+class poppler_EXPORT GlobalParams {
 public:
 
   // Initialize the global parameters by attempting to read a config
diff --git a/poppler/JArithmeticDecoder.h b/poppler/JArithmeticDecoder.h
index 0f091b7..0d395ff 100644
--- a/poppler/JArithmeticDecoder.h
+++ b/poppler/JArithmeticDecoder.h
@@ -23,7 +23,7 @@ class Stream;
 // JArithmeticDecoderStats
 //------------------------------------------------------------------------
 
-class JArithmeticDecoderStats {
+class poppler_EXPORT JArithmeticDecoderStats {
 public:
 
   JArithmeticDecoderStats(int contextSizeA);
@@ -46,7 +46,7 @@ private:
 // JArithmeticDecoder
 //------------------------------------------------------------------------
 
-class JArithmeticDecoder {
+class poppler_EXPORT JArithmeticDecoder {
 public:
 
   JArithmeticDecoder();
diff --git a/poppler/JBIG2Stream.h b/poppler/JBIG2Stream.h
index 7a73938..fb35748 100644
--- a/poppler/JBIG2Stream.h
+++ b/poppler/JBIG2Stream.h
@@ -9,6 +9,8 @@
 #ifndef JBIG2STREAM_H
 #define JBIG2STREAM_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -28,7 +30,7 @@ class JBIG2MMRDecoder;
 
 //------------------------------------------------------------------------
 
-class JBIG2Stream: public FilterStream {
+class poppler_EXPORT JBIG2Stream: public FilterStream {
 public:
 
   JBIG2Stream(Stream *strA, Object *globalsStreamA);
diff --git a/poppler/JPXStream.h b/poppler/JPXStream.h
index 2e0bda3..7856166 100644
--- a/poppler/JPXStream.h
+++ b/poppler/JPXStream.h
@@ -9,6 +9,8 @@
 #ifndef JPXSTREAM_H
 #define JPXSTREAM_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -269,7 +271,7 @@ struct JPXImage {
 
 //------------------------------------------------------------------------
 
-class JPXStream: public FilterStream {
+class poppler_EXPORT JPXStream: public FilterStream {
 public:
 
   JPXStream(Stream *strA);
diff --git a/poppler/Lexer.h b/poppler/Lexer.h
index a07b4f7..37d055e 100644
--- a/poppler/Lexer.h
+++ b/poppler/Lexer.h
@@ -9,6 +9,8 @@
 #ifndef LEXER_H
 #define LEXER_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -24,7 +26,7 @@ class XRef;
 // Lexer
 //------------------------------------------------------------------------
 
-class Lexer {
+class poppler_EXPORT Lexer {
 public:
 
   // Construct a lexer for a single stream.  Deletes the stream when
diff --git a/poppler/Link.h b/poppler/Link.h
index 26f7702..b81d6a9 100644
--- a/poppler/Link.h
+++ b/poppler/Link.h
@@ -9,6 +9,8 @@
 #ifndef LINK_H
 #define LINK_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -35,7 +37,7 @@ enum LinkActionKind {
   actionUnknown			// anything else
 };
 
-class LinkAction {
+class poppler_EXPORT LinkAction {
 public:
 
   // Destructor.
@@ -73,7 +75,7 @@ enum LinkDestKind {
   destFitBV
 };
 
-class LinkDest {
+class poppler_EXPORT LinkDest {
 public:
 
   // Build a LinkDest from the array.
@@ -121,7 +123,7 @@ private:
 // LinkGoTo
 //------------------------------------------------------------------------
 
-class LinkGoTo: public LinkAction {
+class poppler_EXPORT LinkGoTo: public LinkAction {
 public:
 
   // Build a LinkGoTo from a destination (dictionary, name, or string).
@@ -150,7 +152,7 @@ private:
 // LinkGoToR
 //------------------------------------------------------------------------
 
-class LinkGoToR: public LinkAction {
+class poppler_EXPORT LinkGoToR: public LinkAction {
 public:
 
   // Build a LinkGoToR from a file spec (dictionary) and destination
@@ -182,7 +184,7 @@ private:
 // LinkLaunch
 //------------------------------------------------------------------------
 
-class LinkLaunch: public LinkAction {
+class poppler_EXPORT LinkLaunch: public LinkAction {
 public:
 
   // Build a LinkLaunch from an action dictionary.
@@ -209,7 +211,7 @@ private:
 // LinkURI
 //------------------------------------------------------------------------
 
-class LinkURI: public LinkAction {
+class poppler_EXPORT LinkURI: public LinkAction {
 public:
 
   // Build a LinkURI given the URI (string) and base URI.
@@ -234,7 +236,7 @@ private:
 // LinkNamed
 //------------------------------------------------------------------------
 
-class LinkNamed: public LinkAction {
+class poppler_EXPORT LinkNamed: public LinkAction {
 public:
 
   // Build a LinkNamed given the action name.
@@ -256,7 +258,7 @@ private:
 // LinkMovie
 //------------------------------------------------------------------------
 
-class LinkMovie: public LinkAction {
+class poppler_EXPORT LinkMovie: public LinkAction {
 public:
 
   LinkMovie(Object *annotObj, Object *titleObj);
@@ -280,7 +282,7 @@ private:
 // LinkSound
 //------------------------------------------------------------------------
 
-class LinkSound: public LinkAction {
+class poppler_EXPORT LinkSound: public LinkAction {
 public:
 
   LinkSound(Object *soundObj);
@@ -310,7 +312,7 @@ private:
 // LinkUnknown
 //------------------------------------------------------------------------
 
-class LinkUnknown: public LinkAction {
+class poppler_EXPORT LinkUnknown: public LinkAction {
 public:
 
   // Build a LinkUnknown with the specified action type.
@@ -335,7 +337,7 @@ private:
 // Link
 //------------------------------------------------------------------------
 
-class Link {
+class poppler_EXPORT Link {
 public:
 
   // Construct a link, given its dictionary.
@@ -370,7 +372,7 @@ private:
 // Links
 //------------------------------------------------------------------------
 
-class Links {
+class poppler_EXPORT Links {
 public:
 
   // Extract links from array of annotations.
diff --git a/poppler/NameToCharCode.h b/poppler/NameToCharCode.h
index bc57c37..ac2e188 100644
--- a/poppler/NameToCharCode.h
+++ b/poppler/NameToCharCode.h
@@ -19,7 +19,7 @@ struct NameToCharCodeEntry;
 
 //------------------------------------------------------------------------
 
-class NameToCharCode {
+class poppler_EXPORT NameToCharCode {
 public:
 
   NameToCharCode();
diff --git a/poppler/Object.h b/poppler/Object.h
index 4d64795..9c24261 100644
--- a/poppler/Object.h
+++ b/poppler/Object.h
@@ -9,6 +9,8 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -71,7 +73,7 @@ enum ObjType {
 #define initObj(t) type = t
 #endif
 
-class Object {
+class poppler_EXPORT Object {
 public:
 
   // Default constructor.
diff --git a/poppler/Outline.h b/poppler/Outline.h
index 999c21e..d69259b 100644
--- a/poppler/Outline.h
+++ b/poppler/Outline.h
@@ -9,6 +9,8 @@
 #ifndef OUTLINE_H
 #define OUTLINE_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -23,7 +25,7 @@ class LinkAction;
 
 //------------------------------------------------------------------------
 
-class Outline {
+class poppler_EXPORT Outline {
 public:
 
   Outline(Object *outlineObj, XRef *xref);
@@ -39,7 +41,7 @@ private:
 
 //------------------------------------------------------------------------
 
-class OutlineItem {
+class poppler_EXPORT OutlineItem {
 public:
 
   OutlineItem(Dict *dict, XRef *xrefA);
diff --git a/poppler/OutputDev.h b/poppler/OutputDev.h
index af042c6..1e54d73 100644
--- a/poppler/OutputDev.h
+++ b/poppler/OutputDev.h
@@ -9,6 +9,8 @@
 #ifndef OUTPUTDEV_H
 #define OUTPUTDEV_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -38,7 +40,7 @@ class Function;
 // OutputDev
 //------------------------------------------------------------------------
 
-class OutputDev {
+class poppler_EXPORT OutputDev {
 public:
 
   // Constructor.
diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h
index d6e4347..7d95c0c 100644
--- a/poppler/PDFDoc.h
+++ b/poppler/PDFDoc.h
@@ -9,6 +9,8 @@
 #ifndef PDFDOC_H
 #define PDFDOC_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -37,7 +39,7 @@ enum PDFWriteMode {
 // PDFDoc
 //------------------------------------------------------------------------
 
-class PDFDoc {
+class poppler_EXPORT PDFDoc {
 public:
 
   PDFDoc(GooString *fileNameA, GooString *ownerPassword = NULL,
diff --git a/poppler/PDFDocEncoding.h b/poppler/PDFDocEncoding.h
index 7e5f17d..f06bdad 100644
--- a/poppler/PDFDocEncoding.h
+++ b/poppler/PDFDocEncoding.h
@@ -9,11 +9,13 @@
 #ifndef PDFDOCENCODING_H
 #define PDFDOCENCODING_H
 
+#include <poppler-export.h>
+
 #include "CharTypes.h"
 
 class GooString;
 
-extern Unicode pdfDocEncoding[256];
+extern poppler_EXPORT Unicode pdfDocEncoding[256];
 
 char* pdfDocEncodingToUTF16 (GooString* orig, int* length);
 
diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h
index 06b633e..fa3e4fd 100644
--- a/poppler/PSOutputDev.h
+++ b/poppler/PSOutputDev.h
@@ -9,6 +9,8 @@
 #ifndef PSOUTPUTDEV_H
 #define PSOUTPUTDEV_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -48,7 +50,7 @@ enum PSFileType {
 
 typedef void (*PSOutputFunc)(void *stream, char *data, int len);
 
-class PSOutputDev: public OutputDev {
+class poppler_EXPORT PSOutputDev: public OutputDev {
 public:
 
   // Open a PostScript output file, and write the prolog.
diff --git a/poppler/PSTokenizer.h b/poppler/PSTokenizer.h
index fa6d4c2..a4be339 100644
--- a/poppler/PSTokenizer.h
+++ b/poppler/PSTokenizer.h
@@ -9,6 +9,8 @@
 #ifndef PSTOKENIZER_H
 #define PSTOKENIZER_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -17,7 +19,7 @@
 
 //------------------------------------------------------------------------
 
-class PSTokenizer {
+class poppler_EXPORT PSTokenizer {
 public:
 
   PSTokenizer(int (*getCharFuncA)(void *), void *dataA);
diff --git a/poppler/Page.h b/poppler/Page.h
index 864a21e..55001db 100644
--- a/poppler/Page.h
+++ b/poppler/Page.h
@@ -9,6 +9,8 @@
 #ifndef PAGE_H
 #define PAGE_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -28,7 +30,7 @@ class Form;
 
 //------------------------------------------------------------------------
 
-class PDFRectangle {
+class poppler_EXPORT PDFRectangle {
 public:
   double x1, y1, x2, y2;
 
@@ -43,7 +45,7 @@ public:
 // PageAttrs
 //------------------------------------------------------------------------
 
-class PageAttrs {
+class poppler_EXPORT PageAttrs {
 public:
 
   // Construct a new PageAttrs object by merging a dictionary
@@ -103,7 +105,7 @@ private:
 // Page
 //------------------------------------------------------------------------
 
-class Page {
+class poppler_EXPORT Page {
 public:
 
   // Constructor.
diff --git a/poppler/PageLabelInfo.h b/poppler/PageLabelInfo.h
index 506f157..69be6af 100644
--- a/poppler/PageLabelInfo.h
+++ b/poppler/PageLabelInfo.h
@@ -4,12 +4,14 @@
 #include <ctype.h>
 #include <assert.h>
 
+#include "poppler-export.h"
+
 #include "goo/gtypes.h"
 #include "goo/GooList.h"
 #include "goo/GooString.h"
 #include <Object.h>
 
-class PageLabelInfo {
+class poppler_EXPORT PageLabelInfo {
 public:
   PageLabelInfo(Object *tree, int numPages);
   ~PageLabelInfo();
diff --git a/poppler/PageTransition.h b/poppler/PageTransition.h
index 83ab669..1996082 100644
--- a/poppler/PageTransition.h
+++ b/poppler/PageTransition.h
@@ -1,6 +1,8 @@
 #ifndef PAGE_TRANSITION_H
 #define PAGE_TRANSITION_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -39,7 +41,7 @@ enum PageTransitionDirection {
   transitionOutward
 };
 
-class PageTransition {
+class poppler_EXPORT PageTransition {
 public:
   // Construct a Page Transition.
   PageTransition (Object *trans);
diff --git a/poppler/Parser.h b/poppler/Parser.h
index 0422b26..d9d5b4e 100644
--- a/poppler/Parser.h
+++ b/poppler/Parser.h
@@ -9,6 +9,8 @@
 #ifndef PARSER_H
 #define PARSER_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -19,7 +21,7 @@
 // Parser
 //------------------------------------------------------------------------
 
-class Parser {
+class poppler_EXPORT Parser {
 public:
 
   // Constructor.
diff --git a/poppler/PreScanOutputDev.h b/poppler/PreScanOutputDev.h
index e7fa6d4..939ce43 100644
--- a/poppler/PreScanOutputDev.h
+++ b/poppler/PreScanOutputDev.h
@@ -9,6 +9,8 @@
 #ifndef PRESCANOUTPUTDEV_H
 #define PRESCANOUTPUTDEV_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -21,7 +23,7 @@
 // PreScanOutputDev
 //------------------------------------------------------------------------
 
-class PreScanOutputDev: public OutputDev {
+class poppler_EXPORT PreScanOutputDev: public OutputDev {
 public:
 
   // Constructor.
diff --git a/poppler/ProfileData.h b/poppler/ProfileData.h
index 418ee01..387bd13 100644
--- a/poppler/ProfileData.h
+++ b/poppler/ProfileData.h
@@ -9,6 +9,8 @@
 #ifndef PROFILE_DATA_H
 #define PROFILE_DATA_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -17,7 +19,7 @@
 // ProfileData
 //------------------------------------------------------------------------
 
-class ProfileData {
+class poppler_EXPORT ProfileData {
 public:
 
   // Constructor.
diff --git a/poppler/SecurityHandler.h b/poppler/SecurityHandler.h
index 580dba8..314ef08 100644
--- a/poppler/SecurityHandler.h
+++ b/poppler/SecurityHandler.h
@@ -9,6 +9,8 @@
 #ifndef SECURITYHANDLER_H
 #define SECURITYHANDLER_H
 
+#include "poppler-export.h"
+
 #include "poppler-config.h"
 
 #ifdef USE_GCC_PRAGMAS
@@ -26,7 +28,7 @@ struct XpdfSecurityHandler;
 // SecurityHandler
 //------------------------------------------------------------------------
 
-class SecurityHandler {
+class poppler_EXPORT SecurityHandler {
 public:
 
   static SecurityHandler *make(PDFDoc *docA, Object *encryptDictA);
@@ -86,7 +88,7 @@ protected:
 // StandardSecurityHandler
 //------------------------------------------------------------------------
 
-class StandardSecurityHandler: public SecurityHandler {
+class poppler_EXPORT StandardSecurityHandler: public SecurityHandler {
 public:
 
   StandardSecurityHandler(PDFDoc *docA, Object *encryptDictA);
@@ -126,7 +128,7 @@ private:
 // ExternalSecurityHandler
 //------------------------------------------------------------------------
 
-class ExternalSecurityHandler: public SecurityHandler {
+class poppler_EXPORT ExternalSecurityHandler: public SecurityHandler {
 public:
 
   ExternalSecurityHandler(PDFDoc *docA, Object *encryptDictA,
diff --git a/poppler/Sound.h b/poppler/Sound.h
index acb0f8d..4b91de2 100644
--- a/poppler/Sound.h
+++ b/poppler/Sound.h
@@ -19,6 +19,8 @@
 #ifndef Sound_H
 #define Sound_H
 
+#include "poppler-export.h"
+
 class GooString;
 class Object;
 class Stream;
@@ -37,7 +39,7 @@ enum SoundEncoding {
   soundALaw			// A-law-encoded samples
 };
 
-class Sound
+class poppler_EXPORT Sound
 {
 public:
   // Try to parse the Object s
diff --git a/poppler/SplashOutputDev.h b/poppler/SplashOutputDev.h
index 12b4d94..feb4ebe 100644
--- a/poppler/SplashOutputDev.h
+++ b/poppler/SplashOutputDev.h
@@ -9,6 +9,8 @@
 #ifndef SPLASHOUTPUTDEV_H
 #define SPLASHOUTPUTDEV_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -40,7 +42,7 @@ struct SplashTransparencyGroup;
 // SplashOutputDev
 //------------------------------------------------------------------------
 
-class SplashOutputDev: public OutputDev {
+class poppler_EXPORT SplashOutputDev: public OutputDev {
 public:
 
   // Constructor.
diff --git a/poppler/Stream.h b/poppler/Stream.h
index 74152fc..e7b843a 100644
--- a/poppler/Stream.h
+++ b/poppler/Stream.h
@@ -9,6 +9,8 @@
 #ifndef STREAM_H
 #define STREAM_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -55,7 +57,7 @@ enum CryptAlgorithm {
 // Stream (base class)
 //------------------------------------------------------------------------
 
-class Stream {
+class poppler_EXPORT Stream {
 public:
 
   // Constructor.
@@ -213,7 +215,7 @@ private:
 // This is the base class for all streams that read directly from a file.
 //------------------------------------------------------------------------
 
-class BaseStream: public Stream {
+class poppler_EXPORT BaseStream: public Stream {
 public:
 
   BaseStream(Object *dictA);
@@ -242,7 +244,7 @@ private:
 // This is the base class for all streams that filter another stream.
 //------------------------------------------------------------------------
 
-class FilterStream: public Stream {
+class poppler_EXPORT FilterStream: public Stream {
 public:
 
   FilterStream(Stream *strA);
@@ -267,7 +269,7 @@ protected:
 // ImageStream
 //------------------------------------------------------------------------
 
-class ImageStream {
+class poppler_EXPORT ImageStream {
 public:
 
   // Create an image stream object for an image with the specified
@@ -306,7 +308,7 @@ private:
 // StreamPredictor
 //------------------------------------------------------------------------
 
-class StreamPredictor {
+class poppler_EXPORT StreamPredictor {
 public:
 
   // Create a predictor object.  Note that the parameters are for the
@@ -344,7 +346,7 @@ private:
 
 #define fileStreamBufSize 256
 
-class FileStream: public BaseStream {
+class poppler_EXPORT FileStream: public BaseStream {
 public:
 
   FileStream(FILE *fA, Guint startA, GBool limitedA,
@@ -387,7 +389,7 @@ private:
 // MemStream
 //------------------------------------------------------------------------
 
-class MemStream: public BaseStream {
+class poppler_EXPORT MemStream: public BaseStream {
 public:
 
   MemStream(char *bufA, Guint startA, Guint lengthA, Object *dictA);
@@ -433,7 +435,7 @@ private:
 // that creating a new FileStream (using makeSubStream).
 //------------------------------------------------------------------------
 
-class EmbedStream: public BaseStream {
+class poppler_EXPORT EmbedStream: public BaseStream {
 public:
 
   EmbedStream(Stream *strA, Object *dictA, GBool limitedA, Guint lengthA);
@@ -464,7 +466,7 @@ private:
 // ASCIIHexStream
 //------------------------------------------------------------------------
 
-class ASCIIHexStream: public FilterStream {
+class poppler_EXPORT ASCIIHexStream: public FilterStream {
 public:
 
   ASCIIHexStream(Stream *strA);
@@ -487,7 +489,7 @@ private:
 // ASCII85Stream
 //------------------------------------------------------------------------
 
-class ASCII85Stream: public FilterStream {
+class poppler_EXPORT ASCII85Stream: public FilterStream {
 public:
 
   ASCII85Stream(Stream *strA);
@@ -512,7 +514,7 @@ private:
 // LZWStream
 //------------------------------------------------------------------------
 
-class LZWStream: public FilterStream {
+class poppler_EXPORT LZWStream: public FilterStream {
 public:
 
   LZWStream(Stream *strA, int predictor, int columns, int colors,
@@ -556,7 +558,7 @@ private:
 // RunLengthStream
 //------------------------------------------------------------------------
 
-class RunLengthStream: public FilterStream {
+class poppler_EXPORT RunLengthStream: public FilterStream {
 public:
 
   RunLengthStream(Stream *strA);
@@ -586,7 +588,7 @@ private:
 
 struct CCITTCodeTable;
 
-class CCITTFaxStream: public FilterStream {
+class poppler_EXPORT CCITTFaxStream: public FilterStream {
 public:
 
   CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
@@ -664,7 +666,7 @@ struct DCTHuffTable {
   Guchar sym[256];		// symbols
 };
 
-class DCTStream: public FilterStream {
+class poppler_EXPORT DCTStream: public FilterStream {
 public:
 
   DCTStream(Stream *strA, int colorXformA);
@@ -771,7 +773,7 @@ struct FlateDecode {
   int first;			// first length/distance
 };
 
-class FlateStream: public FilterStream {
+class poppler_EXPORT FlateStream: public FilterStream {
 public:
 
   FlateStream(Stream *strA, int predictor, int columns,
@@ -828,7 +830,7 @@ private:
 // EOFStream
 //------------------------------------------------------------------------
 
-class EOFStream: public FilterStream {
+class poppler_EXPORT EOFStream: public FilterStream {
 public:
 
   EOFStream(Stream *strA);
@@ -845,7 +847,7 @@ public:
 // FixedLengthEncoder
 //------------------------------------------------------------------------
 
-class FixedLengthEncoder: public FilterStream {
+class poppler_EXPORT FixedLengthEncoder: public FilterStream {
 public:
 
   FixedLengthEncoder(Stream *strA, int lengthA);
@@ -868,7 +870,7 @@ private:
 // ASCIIHexEncoder
 //------------------------------------------------------------------------
 
-class ASCIIHexEncoder: public FilterStream {
+class poppler_EXPORT ASCIIHexEncoder: public FilterStream {
 public:
 
   ASCIIHexEncoder(Stream *strA);
@@ -898,7 +900,7 @@ private:
 // ASCII85Encoder
 //------------------------------------------------------------------------
 
-class ASCII85Encoder: public FilterStream {
+class poppler_EXPORT ASCII85Encoder: public FilterStream {
 public:
 
   ASCII85Encoder(Stream *strA);
@@ -928,7 +930,7 @@ private:
 // RunLengthEncoder
 //------------------------------------------------------------------------
 
-class RunLengthEncoder: public FilterStream {
+class poppler_EXPORT RunLengthEncoder: public FilterStream {
 public:
 
   RunLengthEncoder(Stream *strA);
diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h
index db40a44..2714737 100644
--- a/poppler/TextOutputDev.h
+++ b/poppler/TextOutputDev.h
@@ -9,6 +9,8 @@
 #ifndef TEXTOUTPUTDEV_H
 #define TEXTOUTPUTDEV_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -52,7 +54,7 @@ enum SelectionStyle {
 // TextFontInfo
 //------------------------------------------------------------------------
 
-class TextFontInfo {
+class poppler_EXPORT TextFontInfo {
 public:
 
   TextFontInfo(GfxState *state);
@@ -89,7 +91,7 @@ private:
 // TextWord
 //------------------------------------------------------------------------
 
-class TextWord {
+class poppler_EXPORT TextWord {
 public:
 
   // Constructor.
@@ -195,7 +197,7 @@ private:
 // TextPool
 //------------------------------------------------------------------------
 
-class TextPool {
+class poppler_EXPORT TextPool {
 public:
 
   TextPool();
@@ -227,7 +229,7 @@ struct TextFlowData;
 // TextLine
 //------------------------------------------------------------------------
 
-class TextLine {
+class poppler_EXPORT TextLine {
 public:
 
   TextLine(TextBlock *blkA, int rotA, double baseA);
@@ -304,7 +306,7 @@ private:
 // TextBlock
 //------------------------------------------------------------------------
 
-class TextBlock {
+class poppler_EXPORT TextBlock {
 public:
 
   TextBlock(TextPage *pageA, int rotA);
@@ -371,7 +373,7 @@ private:
 // TextFlow
 //------------------------------------------------------------------------
 
-class TextFlow {
+class poppler_EXPORT TextFlow {
 public:
 
   TextFlow(TextPage *pageA, TextBlock *blk);
@@ -412,7 +414,7 @@ private:
 // TextWordList
 //------------------------------------------------------------------------
 
-class TextWordList {
+class poppler_EXPORT TextWordList {
 public:
 
   // Build a flat word list, in content stream order (if
@@ -440,7 +442,7 @@ private:
 // TextPage
 //------------------------------------------------------------------------
 
-class TextPage {
+class poppler_EXPORT TextPage {
 public:
 
   // Constructor.
@@ -592,7 +594,7 @@ private:
 // TextOutputDev
 //------------------------------------------------------------------------
 
-class TextOutputDev: public OutputDev {
+class poppler_EXPORT TextOutputDev: public OutputDev {
 public:
 
   // Open a text output file.  If <fileName> is NULL, no file is
diff --git a/poppler/UnicodeMap.h b/poppler/UnicodeMap.h
index 6f03163..65078b3 100644
--- a/poppler/UnicodeMap.h
+++ b/poppler/UnicodeMap.h
@@ -11,6 +11,8 @@
 #ifndef UNICODEMAP_H
 #define UNICODEMAP_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -44,7 +46,7 @@ struct UnicodeMapExt;
 
 //------------------------------------------------------------------------
 
-class UnicodeMap {
+class poppler_EXPORT UnicodeMap {
 public:
 
   // Create the UnicodeMap specified by <encodingName>.  Sets the
@@ -103,7 +105,7 @@ private:
 
 #define unicodeMapCacheSize 4
 
-class UnicodeMapCache {
+class poppler_EXPORT UnicodeMapCache {
 public:
 
   UnicodeMapCache();
diff --git a/poppler/XRef.h b/poppler/XRef.h
index 4a25515..9ae6763 100644
--- a/poppler/XRef.h
+++ b/poppler/XRef.h
@@ -9,6 +9,8 @@
 #ifndef XREF_H
 #define XREF_H
 
+#include "poppler-export.h"
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -40,7 +42,7 @@ struct XRefEntry {
   Object obj; //if this entry was updated, obj will contains the updated object
 };
 
-class XRef {
+class poppler_EXPORT XRef {
 public:
 
   // Constructor, create an empty XRef, used for PDF writing
diff --git a/poppler/poppler-export.h b/poppler/poppler-export.h
new file mode 100644
index 0000000..2a0e3be
--- /dev/null
+++ b/poppler/poppler-export.h
@@ -0,0 +1,23 @@
+#ifndef _POPPLER_EXPORT_H
+#define _POPPLER_EXPORT_H
+# if _WIN32
+#  if defined (poppler_EXPORTS)
+#   define poppler_EXPORT __declspec(dllexport)
+#  else
+#   define poppler_EXPORT __declspec(dllimport)
+#  endif
+# else
+#  define poppler_EXPORT
+# endif
+
+# if _WIN32
+#  if defined (poppler_qt4_EXPORTS)
+#   define poppler_qt4_EXPORT __declspec(dllexport)
+#  else
+#   define poppler_qt4_EXPORT __declspec(dllimport)
+#  endif
+# else
+#  define poppler_qt4_EXPORT
+# endif
+
+#endif
diff --git a/qt4/src/poppler-annotation-helper.h b/qt4/src/poppler-annotation-helper.h
index 0215729..00b67d5 100644
--- a/qt4/src/poppler-annotation-helper.h
+++ b/qt4/src/poppler-annotation-helper.h
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <poppler-export.h>
+
 #include <QtCore/QDebug>
 
 class QColor;
@@ -26,7 +28,7 @@ class AnnotColor;
 
 namespace Poppler {
 
-class XPDFReader
+class poppler_qt4_EXPORT XPDFReader
 {
     public:
         // find named symbol and parse it
diff --git a/qt4/src/poppler-annotation-private.h b/qt4/src/poppler-annotation-private.h
index b428347..f846e60 100644
--- a/qt4/src/poppler-annotation-private.h
+++ b/qt4/src/poppler-annotation-private.h
@@ -19,12 +19,13 @@
 #ifndef _POPPLER_ANNOTATION_PRIVATE_H_
 #define _POPPLER_ANNOTATION_PRIVATE_H_
 
+#include <poppler-export.h>
 #include "poppler-annotation.h"
 
 namespace Poppler
 {
 
-class AnnotationPrivate
+class poppler_qt4_EXPORT AnnotationPrivate
 {
     public:
         AnnotationPrivate();
diff --git a/qt4/src/poppler-annotation.h b/qt4/src/poppler-annotation.h
index efc9948..aaad082 100644
--- a/qt4/src/poppler-annotation.h
+++ b/qt4/src/poppler-annotation.h
@@ -21,6 +21,8 @@
 #ifndef _POPPLER_ANNOTATION_H_
 #define _POPPLER_ANNOTATION_H_
 
+#include <poppler-export.h>
+
 #include <QtCore/QDateTime>
 #include <QtCore/QLinkedList>
 #include <QtCore/QList>
@@ -47,7 +49,7 @@ class Link;
  * \short Helper class for (recursive) Annotation retrieval/storage.
  *
  */
-class AnnotationUtils
+class poppler_qt4_EXPORT AnnotationUtils
 {
     public:
         /**
@@ -80,7 +82,7 @@ class AnnotationUtils
  * An Annotation is an object (text note, highlight, sound, popup window, ..)
  * contained by a Page in the document.
  */
-class Annotation
+class poppler_qt4_EXPORT Annotation
 {
   public:
     // enum definitions
@@ -193,7 +195,7 @@ class Annotation
  * A text annotation is an object showing some text directly on the page, or
  * linked to the contents using an icon shown on a page.
  */
-class TextAnnotation : public Annotation
+class poppler_qt4_EXPORT TextAnnotation : public Annotation
 {
   public:
     TextAnnotation();
@@ -262,7 +264,7 @@ class TextAnnotation : public Annotation
  *
  * This annotation represents a polygon (or polyline) to be drawn on a page.
  */
-class LineAnnotation : public Annotation
+class poppler_qt4_EXPORT LineAnnotation : public Annotation
 {
   public:
     LineAnnotation();
@@ -314,7 +316,7 @@ class LineAnnotation : public Annotation
  * The geometric annotation represents a geometric figure, like a rectangle or
  * an ellipse.
  */
-class GeomAnnotation : public Annotation
+class poppler_qt4_EXPORT GeomAnnotation : public Annotation
 {
   public:
     GeomAnnotation();
@@ -345,7 +347,7 @@ class GeomAnnotation : public Annotation
  *
  * The higlight annotation represents some areas of text being "highlighted".
  */
-class HighlightAnnotation : public Annotation
+class poppler_qt4_EXPORT HighlightAnnotation : public Annotation
 {
   public:
     HighlightAnnotation();
@@ -408,7 +410,7 @@ class HighlightAnnotation : public Annotation
  *
  * A simple annotation drawing a stamp on a page.
  */
-class StampAnnotation : public Annotation
+class poppler_qt4_EXPORT StampAnnotation : public Annotation
 {
   public:
     StampAnnotation();
@@ -455,7 +457,7 @@ class StampAnnotation : public Annotation
  *
  * Annotation representing an ink path on a page.
  */
-class InkAnnotation : public Annotation
+class poppler_qt4_EXPORT InkAnnotation : public Annotation
 {
   public:
     InkAnnotation();
@@ -472,7 +474,7 @@ class InkAnnotation : public Annotation
     Q_DISABLE_COPY( InkAnnotation )
 };
 
-class LinkAnnotation : public Annotation
+class poppler_qt4_EXPORT LinkAnnotation : public Annotation
 {
   public:
     LinkAnnotation();
diff --git a/qt4/src/poppler-form.h b/qt4/src/poppler-form.h
index fa3317d..98c5b6a 100644
--- a/qt4/src/poppler-form.h
+++ b/qt4/src/poppler-form.h
@@ -19,6 +19,8 @@
 #ifndef _POPPLER_QT4_FORM_H_
 #define _POPPLER_QT4_FORM_H_
 
+#include <poppler-export.h>
+
 #include <QtCore/QRectF>
 #include <QtCore/QStringList>
 
@@ -36,7 +38,7 @@ namespace Poppler {
     /**
       The base class representing a form field.
      */
-    class FormField {
+    class poppler_qt4_EXPORT FormField {
     public:
 
 	/**
@@ -157,7 +159,7 @@ namespace Poppler {
     /**
       A form field that represents a text input.
      */
-    class FormFieldText : public FormField {
+    class poppler_qt4_EXPORT FormFieldText : public FormField {
     public:
 
 	/**
@@ -228,7 +230,7 @@ namespace Poppler {
     /**
       A form field that represents a choice field.
      */
-    class FormFieldChoice : public FormField {
+    class poppler_qt4_EXPORT FormFieldChoice : public FormField {
     public:
 
 	/**
diff --git a/qt4/src/poppler-link-extractor-private.h b/qt4/src/poppler-link-extractor-private.h
index 03d93e0..a0c1365 100644
--- a/qt4/src/poppler-link-extractor-private.h
+++ b/qt4/src/poppler-link-extractor-private.h
@@ -19,6 +19,8 @@
 #ifndef _POPPLER_LINK_EXTRACTOR_H_
 #define _POPPLER_LINK_EXTRACTOR_H_
 
+#include <poppler-export.h>
+
 #include <Object.h>
 #include <OutputDev.h>
 
@@ -30,7 +32,7 @@ namespace Poppler
 class Link;
 class PageData;
 
-class LinkExtractorOutputDev : public OutputDev
+class poppler_qt4_EXPORT LinkExtractorOutputDev : public OutputDev
 {
   public:
     LinkExtractorOutputDev(PageData *data);
diff --git a/qt4/src/poppler-link.h b/qt4/src/poppler-link.h
index 7c6e60b..2a6d47b 100644
--- a/qt4/src/poppler-link.h
+++ b/qt4/src/poppler-link.h
@@ -21,6 +21,8 @@
 #ifndef _POPPLER_LINK_H_
 #define _POPPLER_LINK_H_
 
+#include <poppler-export.h>
+
 #include <QtCore/QString>
 #include <QtCore/QRectF>
 #include <QtCore/QSharedDataPointer>
@@ -43,7 +45,7 @@ class SoundObject;
  *
  * Coordinates are in 0..1 range
  */
-class LinkDestination
+class poppler_qt4_EXPORT LinkDestination
 {
 	public:
 		enum Kind
@@ -102,7 +104,7 @@ class LinkDestination
  * kind of links to reimplement the linkType() method and return the type of
  * the link described by the reimplemented class.
  */
-class Link
+class poppler_qt4_EXPORT Link
 {
 	public:
 		Link( const QRectF &linkArea );
@@ -155,7 +157,7 @@ class Link
 
 
 /** Goto: a viewport and maybe a reference to an external filename **/
-class LinkGoto : public Link
+class poppler_qt4_EXPORT LinkGoto : public Link
 {
 	public:
 		/**
@@ -187,7 +189,7 @@ class LinkGoto : public Link
 };
 
 /** Execute: filename and parameters to execute **/
-class LinkExecute : public Link
+class poppler_qt4_EXPORT LinkExecute : public Link
 {
 	public:
 		/**
@@ -216,7 +218,7 @@ class LinkExecute : public Link
 };
 
 /** Browse: an URL to open, ranging from 'http://' to 'mailto:', etc. **/
-class LinkBrowse : public Link
+class poppler_qt4_EXPORT LinkBrowse : public Link
 {
 	public:
 		/**
@@ -243,7 +245,7 @@ class LinkBrowse : public Link
 };	
 
 /** Action: contains an action to perform on document / viewer **/
-class LinkAction : public Link
+class poppler_qt4_EXPORT LinkAction : public Link
 {
 	public:
 		/**
@@ -287,7 +289,7 @@ class LinkAction : public Link
 };
 
 /** Sound: a sound to be played **/
-class LinkSound : public Link
+class poppler_qt4_EXPORT LinkSound : public Link
 {
 	public:
 		// create a Link_Sound
@@ -325,7 +327,7 @@ class LinkSound : public Link
 };
 
 /** Movie: Not yet defined -> think renaming to 'Media' link **/
-class LinkMovie : public Link
+class poppler_qt4_EXPORT LinkMovie : public Link
 // TODO this (Movie link)
 {
 	public:
diff --git a/qt4/src/poppler-page-private.h b/qt4/src/poppler-page-private.h
index dd79306..2405f99 100644
--- a/qt4/src/poppler-page-private.h
+++ b/qt4/src/poppler-page-private.h
@@ -19,6 +19,8 @@
 #ifndef _POPPLER_PAGE_PRIVATE_H_
 #define _POPPLER_PAGE_PRIVATE_H_
 
+#include <poppler-export.h>
+
 class QRectF;
 
 class LinkAction;
@@ -30,7 +32,7 @@ namespace Poppler
 class DocumentData;
 class PageTransition;
 
-class PageData {
+class poppler_qt4_EXPORT PageData {
 public:
   Link* convertLinkActionToLink(::LinkAction * a, const QRectF &linkArea);
 
diff --git a/qt4/src/poppler-private.h b/qt4/src/poppler-private.h
index 32981ae..2d16426 100644
--- a/qt4/src/poppler-private.h
+++ b/qt4/src/poppler-private.h
@@ -26,6 +26,8 @@
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
 
+#include <poppler-export.h>
+
 #include <config.h>
 #include <GfxState.h>
 #include <GlobalParams.h>
@@ -54,7 +56,7 @@ namespace Poppler {
     GooString *QStringToGooString(const QString &s);
 
 
-    class LinkDestinationData
+    class poppler_qt4_EXPORT LinkDestinationData
     {
         public:
             LinkDestinationData( LinkDest *l, GooString *nd, Poppler::DocumentData *pdfdoc )
@@ -67,7 +69,7 @@ namespace Poppler {
             Poppler::DocumentData *doc;
     };
 
-    class DocumentData {
+    class poppler_qt4_EXPORT DocumentData {
     public:
 	DocumentData(GooString *filePath, GooString *ownerPassword, GooString *userPassword)
 	    {
@@ -253,7 +255,7 @@ namespace Poppler {
 	static int count;
     };
 
-    class FontInfoData
+    class poppler_qt4_EXPORT FontInfoData
     {
 	public:
 		FontInfoData( const FontInfoData &fid )
@@ -281,7 +283,7 @@ namespace Poppler {
 		FontInfo::Type type;
     };
 
-    class TextBoxData
+    class poppler_qt4_EXPORT TextBoxData
     {
 	public:
 		QString text;
@@ -292,7 +294,7 @@ namespace Poppler {
 		bool hasSpaceAfter;
     };
 
-    class FormFieldData
+    class poppler_qt4_EXPORT FormFieldData
     {
 	public:
 		FormFieldData(DocumentData *_doc, ::Page *p, ::FormWidget *w) :
diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
index 0fea24d..3d611b2 100644
--- a/qt4/src/poppler-qt4.h
+++ b/qt4/src/poppler-qt4.h
@@ -20,6 +20,8 @@
 #ifndef __POPPLER_QT_H__
 #define __POPPLER_QT_H__
 
+#include <poppler-export.h>
+
 #include "poppler-annotation.h"
 #include "poppler-link.h"
 #include "poppler-page-transition.h"
@@ -58,7 +60,7 @@ namespace Poppler {
 	- a QRectF that gives a box that describes where on the page
 	the text is found.
     */
-    class TextBox {
+    class poppler_qt4_EXPORT TextBox {
     friend class Page;
     public:
       /**
@@ -101,7 +103,7 @@ namespace Poppler {
        Container class for information about a font within a PDF
        document
     */
-    class FontInfo {
+    class poppler_qt4_EXPORT FontInfo {
     public:
 	enum Type {
 		unknown,
@@ -192,7 +194,7 @@ namespace Poppler {
     /**
        Container class for an embedded file with a PDF document
     */
-    class EmbeddedFile {
+    class poppler_qt4_EXPORT EmbeddedFile {
     public:
 	/// \cond PRIVATE
 	EmbeddedFile(EmbFile *embfile);
@@ -259,7 +261,7 @@ namespace Poppler {
     /**
        Page within a PDF document
     */
-    class Page {
+    class poppler_qt4_EXPORT Page {
 	friend class Document;
     public:
 	/**
@@ -462,7 +464,7 @@ namespace Poppler {
 
    A document potentially contains multiple Pages
 */
-    class Document {
+    class poppler_qt4_EXPORT Document {
 	friend class Page;
 	friend class DocumentData;
   
@@ -884,7 +886,7 @@ QString subject = m_doc->info("Subject");
 
        This is the base class for the converters.
     */
-    class BaseConverter
+    class poppler_qt4_EXPORT BaseConverter
     {
         friend class Document;
         public:
@@ -931,7 +933,7 @@ width = dummy.width();
 height = dummy.height();
        \endcode
     */
-    class PSConverter : public BaseConverter
+    class poppler_qt4_EXPORT PSConverter : public BaseConverter
     {
         friend class Document;
         public:
@@ -1017,7 +1019,7 @@ height = dummy.height();
     /**
        Converts a PDF to PDF (thus saves a copy of the document).
     */
-    class PDFConverter : public BaseConverter
+    class poppler_qt4_EXPORT PDFConverter : public BaseConverter
     {
         friend class Document;
         public:
@@ -1052,7 +1054,7 @@ height = dummy.height();
     /**
        Conversion from PDF date string format to QDateTime
     */
-    QDateTime convertDate( char *dateString );
+    poppler_qt4_EXPORT QDateTime convertDate( char *dateString );
 
     class SoundData;
     /**
@@ -1062,7 +1064,7 @@ height = dummy.height();
        whose url is represented by url() ), or Embedded, and the player has to
        play the data contained in data().
     */
-    class SoundObject {
+    class poppler_qt4_EXPORT SoundObject {
     public:
 	/**
 	   The type of sound
diff --git a/splash/Splash.h b/splash/Splash.h
index 58de95a..db5a004 100644
--- a/splash/Splash.h
+++ b/splash/Splash.h
@@ -7,6 +7,8 @@
 #ifndef SPLASH_H
 #define SPLASH_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -63,7 +65,7 @@ enum SplashPipeResultColorCtrl {
 // Splash
 //------------------------------------------------------------------------
 
-class Splash {
+class poppler_EXPORT Splash {
 public:
 
   // Create a new rasterizer object.
diff --git a/splash/SplashBitmap.h b/splash/SplashBitmap.h
index 01e217b..f48591b 100644
--- a/splash/SplashBitmap.h
+++ b/splash/SplashBitmap.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHBITMAP_H
 #define SPLASHBITMAP_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -18,7 +20,7 @@
 // SplashBitmap
 //------------------------------------------------------------------------
 
-class SplashBitmap {
+class poppler_EXPORT SplashBitmap {
 public:
 
   // Create a new bitmap.  It will have <widthA> x <heightA> pixels in
diff --git a/splash/SplashClip.h b/splash/SplashClip.h
index 2420f9c..2c03a33 100644
--- a/splash/SplashClip.h
+++ b/splash/SplashClip.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHCLIP_H
 #define SPLASHCLIP_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -31,7 +33,7 @@ enum SplashClipResult {
 // SplashClip
 //------------------------------------------------------------------------
 
-class SplashClip {
+class poppler_EXPORT SplashClip {
 public:
 
   // Create a clip, for the given rectangle.
diff --git a/splash/SplashFTFont.h b/splash/SplashFTFont.h
index 4e22026..48099b5 100644
--- a/splash/SplashFTFont.h
+++ b/splash/SplashFTFont.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHFTFONT_H
 #define SPLASHFTFONT_H
 
+#include <poppler/poppler-export.h>
+
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
 
 #ifdef USE_GCC_PRAGMAS
@@ -23,7 +25,7 @@ class SplashFTFontFile;
 // SplashFTFont
 //------------------------------------------------------------------------
 
-class SplashFTFont: public SplashFont {
+class poppler_EXPORT SplashFTFont: public SplashFont {
 public:
 
   SplashFTFont(SplashFTFontFile *fontFileA, SplashCoord *matA,
diff --git a/splash/SplashFTFontEngine.h b/splash/SplashFTFontEngine.h
index a0c0b7c..a77cd48 100644
--- a/splash/SplashFTFontEngine.h
+++ b/splash/SplashFTFontEngine.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHFTFONTENGINE_H
 #define SPLASHFTFONTENGINE_H
 
+#include <poppler/poppler-export.h>
+
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/splash/SplashFTFontFile.h b/splash/SplashFTFontFile.h
index 19ff2de..dd3f6cc 100644
--- a/splash/SplashFTFontFile.h
+++ b/splash/SplashFTFontFile.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHFTFONTFILE_H
 #define SPLASHFTFONTFILE_H
 
+#include <poppler/poppler-export.h>
+
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
 
 #ifdef USE_GCC_PRAGMAS
@@ -24,7 +26,7 @@ class SplashFTFontEngine;
 // SplashFTFontFile
 //------------------------------------------------------------------------
 
-class SplashFTFontFile: public SplashFontFile {
+class poppler_EXPORT SplashFTFontFile: public SplashFontFile {
 public:
 
   static SplashFontFile *loadType1Font(SplashFTFontEngine *engineA,
diff --git a/splash/SplashFont.h b/splash/SplashFont.h
index f59b3a1..8df0f17 100644
--- a/splash/SplashFont.h
+++ b/splash/SplashFont.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHFONT_H
 #define SPLASHFONT_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -33,7 +35,7 @@ class SplashPath;
 // SplashFont
 //------------------------------------------------------------------------
 
-class SplashFont {
+class poppler_EXPORT SplashFont {
 public:
 
   SplashFont(SplashFontFile *fontFileA, SplashCoord *matA,
diff --git a/splash/SplashFontEngine.h b/splash/SplashFontEngine.h
index b87d667..bdb6db8 100644
--- a/splash/SplashFontEngine.h
+++ b/splash/SplashFontEngine.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHFONTENGINE_H
 #define SPLASHFONTENGINE_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -30,7 +32,7 @@ class SplashFontSrc;
 // SplashFontEngine
 //------------------------------------------------------------------------
 
-class SplashFontEngine {
+class poppler_EXPORT SplashFontEngine {
 public:
 
   // Create a font engine.
diff --git a/splash/SplashFontFile.h b/splash/SplashFontFile.h
index e04e28c..e646781 100644
--- a/splash/SplashFontFile.h
+++ b/splash/SplashFontFile.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHFONTFILE_H
 #define SPLASHFONTFILE_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -43,7 +45,7 @@ public:
   int refcnt;
 };
 
-class SplashFontFile {
+class poppler_EXPORT SplashFontFile {
 public:
 
   virtual ~SplashFontFile();
diff --git a/splash/SplashFontFileID.h b/splash/SplashFontFileID.h
index cfd89eb..bd35522 100644
--- a/splash/SplashFontFileID.h
+++ b/splash/SplashFontFileID.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHFONTFILEID_H
 #define SPLASHFONTFILEID_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -17,7 +19,7 @@
 // SplashFontFileID
 //------------------------------------------------------------------------
 
-class SplashFontFileID {
+class poppler_EXPORT SplashFontFileID {
 public:
 
   SplashFontFileID();
diff --git a/splash/SplashPath.h b/splash/SplashPath.h
index ea58af0..b9e78a1 100644
--- a/splash/SplashPath.h
+++ b/splash/SplashPath.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHPATH_H
 #define SPLASHPATH_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -51,7 +53,7 @@ struct SplashPathHint {
 // SplashPath
 //------------------------------------------------------------------------
 
-class SplashPath {
+class poppler_EXPORT SplashPath {
 public:
 
   // Create an empty path.
diff --git a/splash/SplashPattern.h b/splash/SplashPattern.h
index 4e3d9ab..9890fce 100644
--- a/splash/SplashPattern.h
+++ b/splash/SplashPattern.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHPATTERN_H
 #define SPLASHPATTERN_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -19,7 +21,7 @@ class SplashScreen;
 // SplashPattern
 //------------------------------------------------------------------------
 
-class SplashPattern {
+class poppler_EXPORT SplashPattern {
 public:
 
   SplashPattern();
@@ -42,7 +44,7 @@ private:
 // SplashSolidColor
 //------------------------------------------------------------------------
 
-class SplashSolidColor: public SplashPattern {
+class poppler_EXPORT SplashSolidColor: public SplashPattern {
 public:
 
   SplashSolidColor(SplashColorPtr colorA);
diff --git a/splash/SplashScreen.h b/splash/SplashScreen.h
index 4174c80..95e0577 100644
--- a/splash/SplashScreen.h
+++ b/splash/SplashScreen.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHSCREEN_H
 #define SPLASHSCREEN_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -17,7 +19,7 @@
 // SplashScreen
 //------------------------------------------------------------------------
 
-class SplashScreen {
+class poppler_EXPORT SplashScreen {
 public:
 
   SplashScreen(SplashScreenParams *params);
diff --git a/splash/SplashState.h b/splash/SplashState.h
index d0e05df..804ff30 100644
--- a/splash/SplashState.h
+++ b/splash/SplashState.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHSTATE_H
 #define SPLASHSTATE_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -38,7 +40,7 @@ class SplashBitmap;
 // SplashState
 //------------------------------------------------------------------------
 
-class SplashState {
+class poppler_EXPORT SplashState {
 public:
 
   // Create a new state object, initialized with default settings.
diff --git a/splash/SplashT1Font.h b/splash/SplashT1Font.h
index d6816b8..8b99322 100644
--- a/splash/SplashT1Font.h
+++ b/splash/SplashT1Font.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHT1FONT_H
 #define SPLASHT1FONT_H
 
+#include <poppler/poppler-export.h>
+
 #if HAVE_T1LIB_H
 
 #ifdef USE_GCC_PRAGMAS
@@ -21,7 +23,7 @@ class SplashT1FontFile;
 // SplashT1Font
 //------------------------------------------------------------------------
 
-class SplashT1Font: public SplashFont {
+class poppler_EXPORT SplashT1Font: public SplashFont {
 public:
 
   SplashT1Font(SplashT1FontFile *fontFileA, SplashCoord *matA,
diff --git a/splash/SplashT1FontEngine.h b/splash/SplashT1FontEngine.h
index ffc285b..373fae9 100644
--- a/splash/SplashT1FontEngine.h
+++ b/splash/SplashT1FontEngine.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHT1FONTENGINE_H
 #define SPLASHT1FONTENGINE_H
 
+#include <poppler/poppler-export.h>
+
 #if HAVE_T1LIB_H
 
 #ifdef USE_GCC_PRAGMAS
@@ -23,7 +25,7 @@ class SplashFontSrc;
 // SplashT1FontEngine
 //------------------------------------------------------------------------
 
-class SplashT1FontEngine {
+class poppler_EXPORT SplashT1FontEngine {
 public:
 
   static SplashT1FontEngine *init(GBool aaA);
diff --git a/splash/SplashT1FontFile.h b/splash/SplashT1FontFile.h
index 465d896..fbcd639 100644
--- a/splash/SplashT1FontFile.h
+++ b/splash/SplashT1FontFile.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHT1FONTFILE_H
 #define SPLASHT1FONTFILE_H
 
+#include <poppler/poppler-export.h>
+
 #if HAVE_T1LIB_H
 
 #ifdef USE_GCC_PRAGMAS
@@ -21,7 +23,7 @@ class SplashT1FontEngine;
 // SplashT1FontFile
 //------------------------------------------------------------------------
 
-class SplashT1FontFile: public SplashFontFile {
+class poppler_EXPORT SplashT1FontFile: public SplashFontFile {
 public:
 
   static SplashFontFile *loadType1Font(SplashT1FontEngine *engineA,
diff --git a/splash/SplashXPath.h b/splash/SplashXPath.h
index 942104f..fcd2104 100644
--- a/splash/SplashXPath.h
+++ b/splash/SplashXPath.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHXPATH_H
 #define SPLASHXPATH_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -46,7 +48,7 @@ struct SplashXPathSeg {
 // SplashXPath
 //------------------------------------------------------------------------
 
-class SplashXPath {
+class poppler_EXPORT SplashXPath {
 public:
 
   // Expands (converts to segments) and flattens (converts curves to
diff --git a/splash/SplashXPathScanner.h b/splash/SplashXPathScanner.h
index 1cc4f3c..a67d7d7 100644
--- a/splash/SplashXPathScanner.h
+++ b/splash/SplashXPathScanner.h
@@ -7,6 +7,8 @@
 #ifndef SPLASHXPATHSCANNER_H
 #define SPLASHXPATHSCANNER_H
 
+#include <poppler/poppler-export.h>
+
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -21,7 +23,7 @@ struct SplashIntersect;
 // SplashXPathScanner
 //------------------------------------------------------------------------
 
-class SplashXPathScanner {
+class poppler_EXPORT SplashXPathScanner {
 public:
 
   // Create a new SplashXPathScanner object.  <xPathA> must be sorted.