diff --git a/dtool/src/dconfig/notifyCategoryProxy.h b/dtool/src/dconfig/notifyCategoryProxy.h
index 7cbe1a27bd..23abe4fbaf 100644
--- a/dtool/src/dconfig/notifyCategoryProxy.h
+++ b/dtool/src/dconfig/notifyCategoryProxy.h
@@ -124,15 +124,26 @@ INLINE ostream &operator << (ostream &out, NotifyCategoryProxy<GetCategory> &pro
 #else // WIN32_VC
 
 #define NotifyCategoryDecl(basename, expcl, exptp) \
-  class expcl NotifyCategoryGetCategory_ ## basename { \
+  class NotifyCategoryGetCategory_ ## basename { \
   public: \
     NotifyCategoryGetCategory_ ## basename(); \
     static NotifyCategory *get_category(); \
   }; \
-  extern expcl NotifyCategoryProxy<NotifyCategoryGetCategory_ ## basename> basename ## _cat;
+  extern NotifyCategoryProxy<NotifyCategoryGetCategory_ ## basename> basename ## _cat;
 
 #endif  // WIN32_VC
 
+// This macro is the same as the above, except that it declares a category
+// that is not intended to be exported from any DLL.
+
+#define NotifyCategoryDeclNoExport(basename) \
+  class NotifyCategoryGetCategory_ ## basename { \
+  public: \
+    NotifyCategoryGetCategory_ ## basename(); \
+    static NotifyCategory *get_category(); \
+  }; \
+  extern NotifyCategoryProxy<NotifyCategoryGetCategory_ ## basename> basename ## _cat;
+
 // This macro defines the actual declaration of the
 // NotifyCategoryProxy object defined above; it should appear in the
 // config_*.C file.  In this macro, parent_category may either be the
diff --git a/panda/src/express/typeHandle.h b/panda/src/express/typeHandle.h
index e31a430180..d93d75a8b8 100644
--- a/panda/src/express/typeHandle.h
+++ b/panda/src/express/typeHandle.h
@@ -294,14 +294,15 @@ PUBLISHED:
   // get_class_type().
   virtual TypeHandle get_type() const=0;
 
+  INLINE bool is_of_type(TypeHandle handle) const;
+  INLINE bool is_exact_type(TypeHandle handle) const;
+
+public:
   // Derived classes should override this function to call
   // init_type().  It will only be called in error situations when the
   // type was for some reason not properly initialized.
   virtual TypeHandle force_init_type()=0;
 
-  INLINE bool is_of_type(TypeHandle handle) const;
-  INLINE bool is_exact_type(TypeHandle handle) const;
-
 public:
   static TypeHandle get_class_type() {
     return _type_handle;