diff --git a/panda/src/audio/audio_gui_functor.h b/panda/src/audio/audio_gui_functor.h
index 3a13154295..c0759590e4 100644
--- a/panda/src/audio/audio_gui_functor.h
+++ b/panda/src/audio/audio_gui_functor.h
@@ -14,12 +14,12 @@ protected:
   GuiBehavior::BehaviorFunctor* _prev;
   PT(AudioSound) _sound;
 public:
+  virtual ~AudioGuiFunctor(void);
   virtual void doit(GuiBehavior*);
 PUBLISHED:
   AudioGuiFunctor(AudioSound* = (AudioSound*)0L,
 		  GuiBehavior::BehaviorFunctor* =
 		  (GuiBehavior::BehaviorFunctor*)0L);
-  virtual ~AudioGuiFunctor(void);
   INLINE AudioSound* get_sound(void) const { return _sound; }
   INLINE GuiBehavior::BehaviorFunctor* get_prev(void) const { return _prev; }
 };
diff --git a/panda/src/gui/guiBehavior.h b/panda/src/gui/guiBehavior.h
index 782bf89834..395dc3c68c 100644
--- a/panda/src/gui/guiBehavior.h
+++ b/panda/src/gui/guiBehavior.h
@@ -18,9 +18,9 @@ PUBLISHED:
   class EXPCL_PANDA BehaviorFunctor {
   public:
     virtual void doit(GuiBehavior*) = 0;
+    virtual ~BehaviorFunctor(void);
   PUBLISHED:
     BehaviorFunctor(void);
-    virtual ~BehaviorFunctor(void);
   };
 PUBLISHED:
   GuiBehavior(const string&);
diff --git a/panda/src/gui/guiButton.cxx b/panda/src/gui/guiButton.cxx
index 077e670177..db35826618 100644
--- a/panda/src/gui/guiButton.cxx
+++ b/panda/src/gui/guiButton.cxx
@@ -59,7 +59,7 @@ inline void GetExtents(GuiLabel* v, GuiLabel* w, GuiLabel* x, GuiLabel* y,
 static void enter_button(CPT_Event e) {
   const MouseWatcherRegion* rgn = DCAST(MouseWatcherRegion, e->get_parameter(0).get_ptr());
   GuiButton* val = find_in_buttons_map(rgn);
-  if (val == (GuiButton *)0L)
+  if (val == (GuiButton*)0L)
     return;  // this one wasn't for us
   val->test_ref_count_integrity();
   val->enter();