diff --git a/dtool/src/dtoolbase/dtoolsymbols.h b/dtool/src/dtoolbase/dtoolsymbols.h
index ff96a4aaf9..98aab5a489 100644
--- a/dtool/src/dtoolbase/dtoolsymbols.h
+++ b/dtool/src/dtoolbase/dtoolsymbols.h
@@ -106,6 +106,9 @@
 #define EXPCL_DTOOL_DTOOLUTIL EXPCL_DTOOL
 #define EXPTP_DTOOL_DTOOLUTIL EXPTP_DTOOL
 
+#define EXPCL_DTOOL_PRC EXPCL_DTOOLCONFIG
+#define EXPTP_DTOOL_PRC EXPTP_DTOOLCONFIG
+
 
 /* These two are always defined empty, because pystub is statically
    built.  But we leave the symbol around in case we change our minds
diff --git a/dtool/src/prc/configDeclaration.h b/dtool/src/prc/configDeclaration.h
index 696f4771d4..9a74acd8d2 100644
--- a/dtool/src/prc/configDeclaration.h
+++ b/dtool/src/prc/configDeclaration.h
@@ -30,7 +30,7 @@ class ConfigVariableCore;
  * pairing of a string name (actually, a ConfigVariableCore pointer) to a
  * string value.
  */
-class EXPCL_DTOOLCONFIG ConfigDeclaration : public ConfigFlags {
+class EXPCL_DTOOL_PRC ConfigDeclaration : public ConfigFlags {
 private:
   ConfigDeclaration(ConfigPage *page, ConfigVariableCore *variable,
                     const string &string_value, int decl_seq);
diff --git a/dtool/src/prc/configFlags.h b/dtool/src/prc/configFlags.h
index 7333c80393..23dfd3fb30 100644
--- a/dtool/src/prc/configFlags.h
+++ b/dtool/src/prc/configFlags.h
@@ -23,7 +23,7 @@
  * It exists only to provide a convenient name scoping for some enumerated
  * values common to both classes.
  */
-class EXPCL_DTOOLCONFIG ConfigFlags {
+class EXPCL_DTOOL_PRC ConfigFlags {
 PUBLISHED:
   enum ValueType {
     VT_undefined,
diff --git a/dtool/src/prc/configPage.h b/dtool/src/prc/configPage.h
index 8c143de836..72659fe096 100644
--- a/dtool/src/prc/configPage.h
+++ b/dtool/src/prc/configPage.h
@@ -27,7 +27,7 @@ class ConfigVariableCore;
  * it may also represent a list of declarations built up by application code
  * and explicitly loaded.
  */
-class EXPCL_DTOOLCONFIG ConfigPage {
+class EXPCL_DTOOL_PRC ConfigPage {
 private:
   ConfigPage(const string &name, bool implicit_load, int page_seq);
   ~ConfigPage();
diff --git a/dtool/src/prc/configPageManager.h b/dtool/src/prc/configPageManager.h
index ff81b3dc57..1ad8f6c3bd 100644
--- a/dtool/src/prc/configPageManager.h
+++ b/dtool/src/prc/configPageManager.h
@@ -28,7 +28,7 @@ class ConfigPage;
  * A global object that maintains the set of ConfigPages everywhere in the
  * world, and keeps them in sorted order.
  */
-class EXPCL_DTOOLCONFIG ConfigPageManager : public ConfigFlags {
+class EXPCL_DTOOL_PRC ConfigPageManager : public ConfigFlags {
 protected:
   ConfigPageManager();
   ~ConfigPageManager();
diff --git a/dtool/src/prc/configVariable.h b/dtool/src/prc/configVariable.h
index 3e42efe4d0..c4f6d20527 100644
--- a/dtool/src/prc/configVariable.h
+++ b/dtool/src/prc/configVariable.h
@@ -28,7 +28,7 @@
  * and/or ConfigDeclaration, more or less duplicating the interface presented
  * there.
  */
-class EXPCL_DTOOLCONFIG ConfigVariable : public ConfigVariableBase {
+class EXPCL_DTOOL_PRC ConfigVariable : public ConfigVariableBase {
 protected:
   INLINE ConfigVariable(const string &name, ValueType type);
   INLINE ConfigVariable(const string &name, ValueType type,
diff --git a/dtool/src/prc/configVariableBase.h b/dtool/src/prc/configVariableBase.h
index cbb7aab183..8bc51a7431 100644
--- a/dtool/src/prc/configVariableBase.h
+++ b/dtool/src/prc/configVariableBase.h
@@ -42,7 +42,7 @@
  * and/or ConfigDeclaration, more or less duplicating the interface presented
  * there.
  */
-class EXPCL_DTOOLCONFIG ConfigVariableBase : public ConfigFlags {
+class EXPCL_DTOOL_PRC ConfigVariableBase : public ConfigFlags {
 protected:
   INLINE ConfigVariableBase(const string &name, ValueType type);
   ConfigVariableBase(const string &name, ValueType type,
diff --git a/dtool/src/prc/configVariableBool.h b/dtool/src/prc/configVariableBool.h
index 9f486c4266..c955b6b16f 100644
--- a/dtool/src/prc/configVariableBool.h
+++ b/dtool/src/prc/configVariableBool.h
@@ -20,7 +20,7 @@
 /**
  * This is a convenience class to specialize ConfigVariable as a boolean type.
  */
-class EXPCL_DTOOLCONFIG ConfigVariableBool : public ConfigVariable {
+class EXPCL_DTOOL_PRC ConfigVariableBool : public ConfigVariable {
 PUBLISHED:
   INLINE ConfigVariableBool(const string &name);
   INLINE ConfigVariableBool(const string &name, bool default_value,
diff --git a/dtool/src/prc/configVariableCore.h b/dtool/src/prc/configVariableCore.h
index e857dd3cc2..19e03436d2 100644
--- a/dtool/src/prc/configVariableCore.h
+++ b/dtool/src/prc/configVariableCore.h
@@ -31,7 +31,7 @@ class ConfigDeclaration;
  * make() method, which may return a shared instance.  Once created, these
  * objects are never destructed.
  */
-class EXPCL_DTOOLCONFIG ConfigVariableCore : public ConfigFlags {
+class EXPCL_DTOOL_PRC ConfigVariableCore : public ConfigFlags {
 private:
   ConfigVariableCore(const string &name);
   ConfigVariableCore(const ConfigVariableCore &templ, const string &name);
diff --git a/dtool/src/prc/configVariableDouble.h b/dtool/src/prc/configVariableDouble.h
index 817449ae2f..49e9585475 100644
--- a/dtool/src/prc/configVariableDouble.h
+++ b/dtool/src/prc/configVariableDouble.h
@@ -21,7 +21,7 @@
  * This is a convenience class to specialize ConfigVariable as a floating-
  * point type.
  */
-class EXPCL_DTOOLCONFIG ConfigVariableDouble : public ConfigVariable {
+class EXPCL_DTOOL_PRC ConfigVariableDouble : public ConfigVariable {
 PUBLISHED:
   INLINE ConfigVariableDouble(const string &name);
   INLINE ConfigVariableDouble(const string &name, double default_value,
diff --git a/dtool/src/prc/configVariableFilename.h b/dtool/src/prc/configVariableFilename.h
index e68c730128..6feb82a24a 100644
--- a/dtool/src/prc/configVariableFilename.h
+++ b/dtool/src/prc/configVariableFilename.h
@@ -24,7 +24,7 @@
  * put OS-specific filenames, or filenames based on environment variables, in
  * the prc file.
  */
-class EXPCL_DTOOLCONFIG ConfigVariableFilename : public ConfigVariable {
+class EXPCL_DTOOL_PRC ConfigVariableFilename : public ConfigVariable {
 PUBLISHED:
   INLINE ConfigVariableFilename(const string &name);
   INLINE ConfigVariableFilename(const string &name, const Filename &default_value,
diff --git a/dtool/src/prc/configVariableInt.h b/dtool/src/prc/configVariableInt.h
index 7605b27480..0156bed21a 100644
--- a/dtool/src/prc/configVariableInt.h
+++ b/dtool/src/prc/configVariableInt.h
@@ -21,7 +21,7 @@
  * This is a convenience class to specialize ConfigVariable as an integer
  * type.
  */
-class EXPCL_DTOOLCONFIG ConfigVariableInt : public ConfigVariable {
+class EXPCL_DTOOL_PRC ConfigVariableInt : public ConfigVariable {
 PUBLISHED:
   INLINE ConfigVariableInt(const string &name);
   INLINE ConfigVariableInt(const string &name, int default_value,
diff --git a/dtool/src/prc/configVariableInt64.h b/dtool/src/prc/configVariableInt64.h
index 40477f87cc..14d02e2ee9 100644
--- a/dtool/src/prc/configVariableInt64.h
+++ b/dtool/src/prc/configVariableInt64.h
@@ -22,7 +22,7 @@
  * This is a convenience class to specialize ConfigVariable as a 64-bit
  * integer type.
  */
-class EXPCL_DTOOLCONFIG ConfigVariableInt64 : public ConfigVariable {
+class EXPCL_DTOOL_PRC ConfigVariableInt64 : public ConfigVariable {
 PUBLISHED:
   INLINE ConfigVariableInt64(const string &name);
   INLINE ConfigVariableInt64(const string &name, int64_t default_value,
diff --git a/dtool/src/prc/configVariableList.h b/dtool/src/prc/configVariableList.h
index 448f8b5886..ca639a94ae 100644
--- a/dtool/src/prc/configVariableList.h
+++ b/dtool/src/prc/configVariableList.h
@@ -28,7 +28,7 @@
  *
  * A ConfigVariableList cannot be modified locally.
  */
-class EXPCL_DTOOLCONFIG ConfigVariableList : public ConfigVariableBase {
+class EXPCL_DTOOL_PRC ConfigVariableList : public ConfigVariableBase {
 PUBLISHED:
   INLINE ConfigVariableList(const string &name,
                             const string &description = string(),
diff --git a/dtool/src/prc/configVariableManager.h b/dtool/src/prc/configVariableManager.h
index 78b943fef7..713e1bc5d2 100644
--- a/dtool/src/prc/configVariableManager.h
+++ b/dtool/src/prc/configVariableManager.h
@@ -28,7 +28,7 @@ class ConfigVariableCore;
  * ConfigVariableCores) everywhere in the world, and keeps them in sorted
  * order.
  */
-class EXPCL_DTOOLCONFIG ConfigVariableManager {
+class EXPCL_DTOOL_PRC ConfigVariableManager {
 protected:
   ConfigVariableManager();
   ~ConfigVariableManager();
diff --git a/dtool/src/prc/configVariableSearchPath.h b/dtool/src/prc/configVariableSearchPath.h
index 6a6cfeb0ab..4dfe1b0fcf 100644
--- a/dtool/src/prc/configVariableSearchPath.h
+++ b/dtool/src/prc/configVariableSearchPath.h
@@ -33,7 +33,7 @@
  * variable, created by using the same name to the constructor, will not
  * reflect the local changes.
  */
-class EXPCL_DTOOLCONFIG ConfigVariableSearchPath : public ConfigVariableBase {
+class EXPCL_DTOOL_PRC ConfigVariableSearchPath : public ConfigVariableBase {
 PUBLISHED:
   INLINE ConfigVariableSearchPath(const string &name,
                                   const string &description = string(),
diff --git a/dtool/src/prc/configVariableString.h b/dtool/src/prc/configVariableString.h
index 1592e0b836..0b6d615667 100644
--- a/dtool/src/prc/configVariableString.h
+++ b/dtool/src/prc/configVariableString.h
@@ -20,7 +20,7 @@
 /**
  * This is a convenience class to specialize ConfigVariable as a string type.
  */
-class EXPCL_DTOOLCONFIG ConfigVariableString : public ConfigVariable {
+class EXPCL_DTOOL_PRC ConfigVariableString : public ConfigVariable {
 PUBLISHED:
   INLINE ConfigVariableString(const string &name);
   INLINE ConfigVariableString(const string &name, const string &default_value,
diff --git a/dtool/src/prc/config_prc.h b/dtool/src/prc/config_prc.h
index 5fbe9ec7d3..43e9b37648 100644
--- a/dtool/src/prc/config_prc.h
+++ b/dtool/src/prc/config_prc.h
@@ -19,7 +19,7 @@
 
 class ConfigVariableBool;
 
-NotifyCategoryDecl(prc, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG);
+NotifyCategoryDecl(prc, EXPCL_DTOOL_PRC, EXPTP_DTOOL_PRC);
 
 // This is aligned to match the shadowed definition in notify.cxx.
 extern ALIGN_16BYTE ConfigVariableBool assert_abort;
diff --git a/dtool/src/prc/encryptStream.h b/dtool/src/prc/encryptStream.h
index a5d4972ccd..540d4b3209 100644
--- a/dtool/src/prc/encryptStream.h
+++ b/dtool/src/prc/encryptStream.h
@@ -31,7 +31,7 @@
  *
  * Seeking is not supported.
  */
-class EXPCL_DTOOLCONFIG IDecryptStream : public istream {
+class EXPCL_DTOOL_PRC IDecryptStream : public istream {
 PUBLISHED:
   INLINE IDecryptStream();
   INLINE explicit IDecryptStream(istream *source, bool owns_source,
@@ -66,7 +66,7 @@ private:
  *
  * Seeking is not supported.
  */
-class EXPCL_DTOOLCONFIG OEncryptStream : public ostream {
+class EXPCL_DTOOL_PRC OEncryptStream : public ostream {
 PUBLISHED:
   INLINE OEncryptStream();
   INLINE explicit OEncryptStream(ostream *dest, bool owns_dest,
diff --git a/dtool/src/prc/encryptStreamBuf.h b/dtool/src/prc/encryptStreamBuf.h
index b7d95424c2..8a812f1701 100644
--- a/dtool/src/prc/encryptStreamBuf.h
+++ b/dtool/src/prc/encryptStreamBuf.h
@@ -24,7 +24,7 @@ typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
 /**
  * The streambuf object that implements IDecompressStream and OCompressStream.
  */
-class EXPCL_DTOOLCONFIG EncryptStreamBuf : public streambuf {
+class EXPCL_DTOOL_PRC EncryptStreamBuf : public streambuf {
 public:
   EncryptStreamBuf();
   virtual ~EncryptStreamBuf();
diff --git a/dtool/src/prc/nativeNumericData.h b/dtool/src/prc/nativeNumericData.h
index db1e9e5b06..04af522643 100644
--- a/dtool/src/prc/nativeNumericData.h
+++ b/dtool/src/prc/nativeNumericData.h
@@ -36,7 +36,7 @@
  * typedeffed to be one of these or the other, according to the machine's
  * architecture.
  */
-class EXPCL_DTOOLCONFIG NativeNumericData {
+class EXPCL_DTOOL_PRC NativeNumericData {
 public:
   INLINE NativeNumericData(const void *data, size_t length);
   INLINE NativeNumericData(const void *data, size_t start, size_t length);
diff --git a/dtool/src/prc/notifyCategory.h b/dtool/src/prc/notifyCategory.h
index 343591d122..61f4e71906 100644
--- a/dtool/src/prc/notifyCategory.h
+++ b/dtool/src/prc/notifyCategory.h
@@ -29,7 +29,7 @@
  * a package level; further nested categories can be created within a package
  * if a finer grain of control is required.
  */
-class EXPCL_DTOOLCONFIG NotifyCategory : public MemoryBase, public ConfigFlags {
+class EXPCL_DTOOL_PRC NotifyCategory : public MemoryBase, public ConfigFlags {
 private:
   NotifyCategory(const string &fullname, const string &basename,
                  NotifyCategory *parent);
diff --git a/dtool/src/prc/notifySeverity.h b/dtool/src/prc/notifySeverity.h
index 8750602d73..d16cdb89d8 100644
--- a/dtool/src/prc/notifySeverity.h
+++ b/dtool/src/prc/notifySeverity.h
@@ -28,8 +28,8 @@ enum NotifySeverity {
 };
 END_PUBLISH
 
-EXPCL_DTOOLCONFIG ostream &operator << (ostream &out, NotifySeverity severity);
-EXPCL_DTOOLCONFIG istream &operator >> (istream &in, NotifySeverity &severity);
+EXPCL_DTOOL_PRC ostream &operator << (ostream &out, NotifySeverity severity);
+EXPCL_DTOOL_PRC istream &operator >> (istream &in, NotifySeverity &severity);
 
 
 #endif
diff --git a/dtool/src/prc/pnotify.h b/dtool/src/prc/pnotify.h
index e51022c28a..27a346d0d9 100644
--- a/dtool/src/prc/pnotify.h
+++ b/dtool/src/prc/pnotify.h
@@ -30,7 +30,7 @@ class NotifyCategory;
  * independently enabled or disabled, so that error messages may be squelched
  * or respected according to the wishes of the user.
  */
-class EXPCL_DTOOLCONFIG Notify {
+class EXPCL_DTOOL_PRC Notify {
 PUBLISHED:
   Notify();
   ~Notify();
diff --git a/dtool/src/prc/prcKeyRegistry.h b/dtool/src/prc/prcKeyRegistry.h
index 69e25d949e..0a21d182ad 100644
--- a/dtool/src/prc/prcKeyRegistry.h
+++ b/dtool/src/prc/prcKeyRegistry.h
@@ -33,7 +33,7 @@ typedef struct evp_pkey_st EVP_PKEY;
  *
  * This class requires the OpenSSL library.
  */
-class EXPCL_DTOOLCONFIG PrcKeyRegistry {
+class EXPCL_DTOOL_PRC PrcKeyRegistry {
 protected:
   PrcKeyRegistry();
   ~PrcKeyRegistry();
diff --git a/dtool/src/prc/reversedNumericData.h b/dtool/src/prc/reversedNumericData.h
index d92ab82964..9979fbb3a2 100644
--- a/dtool/src/prc/reversedNumericData.h
+++ b/dtool/src/prc/reversedNumericData.h
@@ -39,7 +39,7 @@ static const int max_numeric_size = 8;
  * typedeffed to be one of these or the other, according to the machine's
  * architecture.
  */
-class EXPCL_DTOOLCONFIG ReversedNumericData {
+class EXPCL_DTOOL_PRC ReversedNumericData {
 public:
   INLINE ReversedNumericData(const void *data, size_t length);
   INLINE ReversedNumericData(const void *data, size_t start, size_t length);
diff --git a/dtool/src/prc/streamReader.h b/dtool/src/prc/streamReader.h
index 3d8865e21d..bedaa0eeb5 100644
--- a/dtool/src/prc/streamReader.h
+++ b/dtool/src/prc/streamReader.h
@@ -24,7 +24,7 @@
  * A class to read sequential binary data directly from an istream.  Its
  * interface is similar to DatagramIterator by design; see also StreamWriter.
  */
-class EXPCL_DTOOLCONFIG StreamReader {
+class EXPCL_DTOOL_PRC StreamReader {
 public:
   INLINE StreamReader(istream &in);
 PUBLISHED:
diff --git a/dtool/src/prc/streamWrapper.h b/dtool/src/prc/streamWrapper.h
index 856cf6f855..f3e4028c1b 100644
--- a/dtool/src/prc/streamWrapper.h
+++ b/dtool/src/prc/streamWrapper.h
@@ -21,7 +21,7 @@
  * The base class for both IStreamWrapper and OStreamWrapper, this provides
  * the common locking interface.
  */
-class EXPCL_DTOOLCONFIG StreamWrapperBase {
+class EXPCL_DTOOL_PRC StreamWrapperBase {
 protected:
   INLINE StreamWrapperBase();
 
@@ -48,7 +48,7 @@ private:
  * A thread may use this class to perform an atomic seek/read/gcount
  * operation.
  */
-class EXPCL_DTOOLCONFIG IStreamWrapper : virtual public StreamWrapperBase {
+class EXPCL_DTOOL_PRC IStreamWrapper : virtual public StreamWrapperBase {
 public:
   INLINE IStreamWrapper(istream *stream, bool owns_pointer);
 PUBLISHED:
@@ -75,7 +75,7 @@ private:
  * This class provides a locking wrapper around an arbitrary ostream pointer.
  * A thread may use this class to perform an atomic seek/write operation.
  */
-class EXPCL_DTOOLCONFIG OStreamWrapper : virtual public StreamWrapperBase {
+class EXPCL_DTOOL_PRC OStreamWrapper : virtual public StreamWrapperBase {
 public:
   INLINE OStreamWrapper(ostream *stream, bool owns_pointer, bool stringstream_hack = false);
 PUBLISHED:
@@ -111,7 +111,7 @@ private:
  * This class provides a locking wrapper around a combination ostream/istream
  * pointer.
  */
-class EXPCL_DTOOLCONFIG StreamWrapper : public IStreamWrapper, public OStreamWrapper {
+class EXPCL_DTOOL_PRC StreamWrapper : public IStreamWrapper, public OStreamWrapper {
 public:
   INLINE StreamWrapper(iostream *stream, bool owns_pointer, bool stringstream_hack = false);
 PUBLISHED:
diff --git a/dtool/src/prc/streamWriter.h b/dtool/src/prc/streamWriter.h
index 8e2cf4dc1b..b39db968c0 100644
--- a/dtool/src/prc/streamWriter.h
+++ b/dtool/src/prc/streamWriter.h
@@ -26,7 +26,7 @@
  * primarily intended as a convenience to eliminate the overhead of writing
  * bytes to a Datagram and then writing the Datagram to a stream.
  */
-class EXPCL_DTOOLCONFIG StreamWriter {
+class EXPCL_DTOOL_PRC StreamWriter {
 public:
   INLINE StreamWriter(ostream &out);
 PUBLISHED: