diff --git a/dtool/src/dtoolbase/dtoolsymbols.h b/dtool/src/dtoolbase/dtoolsymbols.h
index a09ec2fb23..5f972e776f 100644
--- a/dtool/src/dtoolbase/dtoolsymbols.h
+++ b/dtool/src/dtoolbase/dtoolsymbols.h
@@ -68,19 +68,45 @@
   */
 
 #ifdef BUILDING_DTOOL
-  #define EXPCL_DTOOL EXPORT_CLASS
-  #define EXPTP_DTOOL EXPORT_TEMPL
-#else
-  #define EXPCL_DTOOL IMPORT_CLASS
-  #define EXPTP_DTOOL IMPORT_TEMPL
+  #define BUILDING_DTOOL_DTOOLBASE
+  #define BUILDING_DTOOL_DTOOLUTIL
 #endif
 
 #ifdef BUILDING_DTOOLCONFIG
-  #define EXPCL_DTOOLCONFIG EXPORT_CLASS
-  #define EXPTP_DTOOLCONFIG EXPORT_TEMPL
+  #define BUILDING_DTOOL_PRC
+  #define BUILDING_DTOOL_DCONFIG
+#endif
+
+#ifdef BUILDING_DTOOL_DTOOLBASE
+  #define EXPCL_DTOOL_DTOOLBASE EXPORT_CLASS
+  #define EXPTP_DTOOL_DTOOLBASE EXPORT_TEMPL
 #else
-  #define EXPCL_DTOOLCONFIG IMPORT_CLASS
-  #define EXPTP_DTOOLCONFIG IMPORT_TEMPL
+  #define EXPCL_DTOOL_DTOOLBASE IMPORT_CLASS
+  #define EXPTP_DTOOL_DTOOLBASE IMPORT_TEMPL
+#endif
+
+#ifdef BUILDING_DTOOL_DTOOLUTIL
+  #define EXPCL_DTOOL_DTOOLUTIL EXPORT_CLASS
+  #define EXPTP_DTOOL_DTOOLUTIL EXPORT_TEMPL
+#else
+  #define EXPCL_DTOOL_DTOOLUTIL IMPORT_CLASS
+  #define EXPTP_DTOOL_DTOOLUTIL IMPORT_TEMPL
+#endif
+
+#ifdef BUILDING_DTOOL_PRC
+  #define EXPCL_DTOOL_PRC EXPORT_CLASS
+  #define EXPTP_DTOOL_PRC EXPORT_TEMPL
+#else
+  #define EXPCL_DTOOL_PRC IMPORT_CLASS
+  #define EXPTP_DTOOL_PRC IMPORT_TEMPL
+#endif
+
+#ifdef BUILDING_DTOOL_DCONFIG
+  #define EXPCL_DTOOL_DCONFIG EXPORT_CLASS
+  #define EXPTP_DTOOL_DCONFIG EXPORT_TEMPL
+#else
+  #define EXPCL_DTOOL_DCONFIG IMPORT_CLASS
+  #define EXPTP_DTOOL_DCONFIG IMPORT_TEMPL
 #endif
 
 #ifdef BUILDING_INTERROGATEDB
@@ -100,19 +126,6 @@
 #endif /* BUILDING_MISC */
 
 
-#define EXPCL_DTOOL_DTOOLBASE EXPCL_DTOOL
-#define EXPTP_DTOOL_DTOOLBASE EXPTP_DTOOL
-
-#define EXPCL_DTOOL_DTOOLUTIL EXPCL_DTOOL
-#define EXPTP_DTOOL_DTOOLUTIL EXPTP_DTOOL
-
-#define EXPCL_DTOOL_PRC EXPCL_DTOOLCONFIG
-#define EXPTP_DTOOL_PRC EXPTP_DTOOLCONFIG
-
-#define EXPCL_DTOOL_DCONFIG EXPCL_DTOOLCONFIG
-#define EXPTP_DTOOL_DCONFIG 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
    to make pystub once again be a dynamic library. */