diff --git a/panda/src/android/pnmFileTypeAndroid.h b/panda/src/android/pnmFileTypeAndroid.h
index f27cc4f23d..d872c58578 100644
--- a/panda/src/android/pnmFileTypeAndroid.h
+++ b/panda/src/android/pnmFileTypeAndroid.h
@@ -28,7 +28,7 @@
  * Wrapper class around the Android Bitmap mechanism to allow loading images
  * on Android without needing libpng or libjpeg.
  */
-class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypeAndroid : public PNMFileType {
+class PNMFileTypeAndroid : public PNMFileType {
 public:
   enum CompressFormat : jint {
     CF_jpeg = 0,
diff --git a/panda/src/chan/bindAnimRequest.h b/panda/src/chan/bindAnimRequest.h
index fed5e5d596..1c555de10a 100644
--- a/panda/src/chan/bindAnimRequest.h
+++ b/panda/src/chan/bindAnimRequest.h
@@ -25,7 +25,7 @@ class AnimControl;
  * This class object manages an asynchronous load-and-bind animation request,
  * as issued through PartBundle::load_bind_anim().
  */
-class EXPCL_PANDA_PGRAPH BindAnimRequest : public ModelLoadRequest {
+class EXPCL_PANDA_CHAN BindAnimRequest : public ModelLoadRequest {
 public:
   ALLOC_DELETED_CHAIN(BindAnimRequest);
 
diff --git a/panda/src/display/displayRegionCullCallbackData.h b/panda/src/display/displayRegionCullCallbackData.h
index 509f5e2e2c..bb78dbc9c9 100644
--- a/panda/src/display/displayRegionCullCallbackData.h
+++ b/panda/src/display/displayRegionCullCallbackData.h
@@ -24,7 +24,7 @@ class SceneSetup;
  * This specialization on CallbackData is passed when the callback is
  * initiated from the cull traversal, for a DisplayRegion.
  */
-class EXPCL_PANDA_PGRAPH DisplayRegionCullCallbackData : public CallbackData {
+class EXPCL_PANDA_DISPLAY DisplayRegionCullCallbackData : public CallbackData {
 public:
   DisplayRegionCullCallbackData(CullHandler *cull_handler, SceneSetup *scene_setup);
 
diff --git a/panda/src/display/displayRegionDrawCallbackData.h b/panda/src/display/displayRegionDrawCallbackData.h
index 55f76baf2e..bbdfdc99b3 100644
--- a/panda/src/display/displayRegionDrawCallbackData.h
+++ b/panda/src/display/displayRegionDrawCallbackData.h
@@ -24,7 +24,7 @@ class SceneSetup;
  * This specialization on CallbackData is passed when the callback is
  * initiated from the draw traversal, for a DisplayRegion.
  */
-class EXPCL_PANDA_PGRAPH DisplayRegionDrawCallbackData : public CallbackData {
+class EXPCL_PANDA_DISPLAY DisplayRegionDrawCallbackData : public CallbackData {
 public:
   DisplayRegionDrawCallbackData(CullResult *cull_result, SceneSetup *scene_setup);
 
diff --git a/panda/src/event/asyncTaskCollection.h b/panda/src/event/asyncTaskCollection.h
index 4ed6f6a59b..70918bc49f 100644
--- a/panda/src/event/asyncTaskCollection.h
+++ b/panda/src/event/asyncTaskCollection.h
@@ -24,7 +24,7 @@
  *
  * TODO: None of this is thread-safe yet.
  */
-class EXPCL_PANDA_PGRAPH AsyncTaskCollection {
+class EXPCL_PANDA_EVENT AsyncTaskCollection {
 PUBLISHED:
   AsyncTaskCollection();
   AsyncTaskCollection(const AsyncTaskCollection &copy);
diff --git a/panda/src/event/genericAsyncTask.h b/panda/src/event/genericAsyncTask.h
index 9ff7ae272a..6530a8112a 100644
--- a/panda/src/event/genericAsyncTask.h
+++ b/panda/src/event/genericAsyncTask.h
@@ -23,7 +23,7 @@
  * You can use this when you want to create an AsyncTask without having to
  * subclass.
  */
-class EXPCL_PANDA_PIPELINE GenericAsyncTask : public AsyncTask {
+class EXPCL_PANDA_EVENT GenericAsyncTask : public AsyncTask {
 public:
   typedef DoneStatus TaskFunc(GenericAsyncTask *task, void *user_data);
   typedef void BirthFunc(GenericAsyncTask *task, void *user_data);
diff --git a/panda/src/gobj/animateVerticesRequest.h b/panda/src/gobj/animateVerticesRequest.h
index be20651a13..0d804a927d 100644
--- a/panda/src/gobj/animateVerticesRequest.h
+++ b/panda/src/gobj/animateVerticesRequest.h
@@ -30,7 +30,7 @@
  * requests are being run (presumably on multiple CPUs/cores), to ensure that
  * the data has been computed by the time it's needed.
  */
-class EXPCL_PANDA_PGRAPH AnimateVerticesRequest : public AsyncTask {
+class EXPCL_PANDA_GOBJ AnimateVerticesRequest : public AsyncTask {
 public:
   ALLOC_DELETED_CHAIN(AnimateVerticesRequest);
 
diff --git a/panda/src/parametrics/curveFitter.h b/panda/src/parametrics/curveFitter.h
index a83778951f..a07fd532a4 100644
--- a/panda/src/parametrics/curveFitter.h
+++ b/panda/src/parametrics/curveFitter.h
@@ -30,7 +30,7 @@ class NurbsCurve;
 /**
  *
  */
-class EXPCL_PANDA_GOBJ CurveFitter {
+class EXPCL_PANDA_PARAMETRICS CurveFitter {
 PUBLISHED:
   CurveFitter();
   ~CurveFitter();
diff --git a/panda/src/pgraph/paramNodePath.h b/panda/src/pgraph/paramNodePath.h
index 86f027eb99..dae621443f 100644
--- a/panda/src/pgraph/paramNodePath.h
+++ b/panda/src/pgraph/paramNodePath.h
@@ -21,7 +21,7 @@
 /**
  * A class object for storing a NodePath as a parameter.
  */
-class EXPCL_PANDA_GOBJ ParamNodePath : public ParamValueBase {
+class EXPCL_PANDA_PGRAPH ParamNodePath : public ParamValueBase {
 protected:
   INLINE ParamNodePath() {};
 
diff --git a/panda/src/putil/bamReader.h b/panda/src/putil/bamReader.h
index bf88ced2af..14403f6cae 100644
--- a/panda/src/putil/bamReader.h
+++ b/panda/src/putil/bamReader.h
@@ -58,7 +58,7 @@
  * object's read pass.  To use this, subclass BamReaderAuxData and add
  * whatever additional data you require.
  */
-class EXPCL_PANDA_PGRAPH BamReaderAuxData : public TypedReferenceCount {
+class EXPCL_PANDA_PUTIL BamReaderAuxData : public TypedReferenceCount {
 public:
   INLINE BamReaderAuxData();