diff --git a/panda/src/vrpn/vrpnAnalog.I b/panda/src/vrpn/vrpnAnalog.I
index afd951e417..234e6b4616 100644
--- a/panda/src/vrpn/vrpnAnalog.I
+++ b/panda/src/vrpn/vrpnAnalog.I
@@ -28,12 +28,3 @@ INLINE bool VrpnAnalog::
 is_empty() const {
   return _devices.empty();
 }
-
-/**
- * Polls the connected device.  Normally you should not call this directly;
- * this will be called by the VrpnClient.
- */
-INLINE void VrpnAnalog::
-poll() {
-  _analog->mainloop();
-}
diff --git a/panda/src/vrpn/vrpnAnalog.cxx b/panda/src/vrpn/vrpnAnalog.cxx
index 2745aab75e..b0b81c8867 100644
--- a/panda/src/vrpn/vrpnAnalog.cxx
+++ b/panda/src/vrpn/vrpnAnalog.cxx
@@ -70,6 +70,15 @@ unmark(VrpnAnalogDevice *device) {
   }
 }
 
+/**
+ * Polls the connected device.  Normally you should not call this directly;
+ * this will be called by the VrpnClient.
+ */
+void VrpnAnalog::
+poll() {
+  _analog->mainloop();
+}
+
 /**
  *
  */
diff --git a/panda/src/vrpn/vrpnAnalog.h b/panda/src/vrpn/vrpnAnalog.h
index 07f3c84b21..34bc51f277 100644
--- a/panda/src/vrpn/vrpnAnalog.h
+++ b/panda/src/vrpn/vrpnAnalog.h
@@ -46,7 +46,7 @@ public:
   void mark(VrpnAnalogDevice *device);
   void unmark(VrpnAnalogDevice *device);
 
-  INLINE void poll();
+  void poll();
 
   void output(std::ostream &out) const;
   void write(std::ostream &out, int indent_level = 0) const;
diff --git a/panda/src/vrpn/vrpnButton.I b/panda/src/vrpn/vrpnButton.I
index ed10b89fae..e083d0325b 100644
--- a/panda/src/vrpn/vrpnButton.I
+++ b/panda/src/vrpn/vrpnButton.I
@@ -28,12 +28,3 @@ INLINE bool VrpnButton::
 is_empty() const {
   return _devices.empty();
 }
-
-/**
- * Polls the connected device.  Normally you should not call this directly;
- * this will be called by the VrpnClient.
- */
-INLINE void VrpnButton::
-poll() {
-  _button->mainloop();
-}
diff --git a/panda/src/vrpn/vrpnButton.cxx b/panda/src/vrpn/vrpnButton.cxx
index 3312afa31d..eefbcf1015 100644
--- a/panda/src/vrpn/vrpnButton.cxx
+++ b/panda/src/vrpn/vrpnButton.cxx
@@ -70,6 +70,15 @@ unmark(VrpnButtonDevice *device) {
   }
 }
 
+/**
+ * Polls the connected device.  Normally you should not call this directly;
+ * this will be called by the VrpnClient.
+ */
+void VrpnButton::
+poll() {
+  _button->mainloop();
+}
+
 /**
  *
  */
diff --git a/panda/src/vrpn/vrpnButton.h b/panda/src/vrpn/vrpnButton.h
index 1b9fc14cf4..3b151b5130 100644
--- a/panda/src/vrpn/vrpnButton.h
+++ b/panda/src/vrpn/vrpnButton.h
@@ -45,7 +45,7 @@ public:
   void mark(VrpnButtonDevice *device);
   void unmark(VrpnButtonDevice *device);
 
-  INLINE void poll();
+  void poll();
 
   void output(std::ostream &out) const;
   void write(std::ostream &out, int indent_level = 0) const;
diff --git a/panda/src/vrpn/vrpnClient.I b/panda/src/vrpn/vrpnClient.I
index 486a4e29f6..908c77a0c9 100644
--- a/panda/src/vrpn/vrpnClient.I
+++ b/panda/src/vrpn/vrpnClient.I
@@ -19,25 +19,6 @@ get_server_name() const {
   return _server_name;
 }
 
-/**
- * Returns true if everything seems to be kosher with the server (even if
- * there is no connection), or false otherwise.
- */
-INLINE bool VrpnClient::
-is_valid() const {
-  return (_connection->doing_okay() != 0);
-}
-
-/**
- * Returns true if the connection is established successfully, false
- * otherwise.
- */
-INLINE bool VrpnClient::
-is_connected() const {
-  return (_connection->connected() != 0);
-}
-
-
 /**
  * Little inline function to convert a struct timeval to only seconds
  */
diff --git a/panda/src/vrpn/vrpnClient.cxx b/panda/src/vrpn/vrpnClient.cxx
index 1fb7fcb4ff..9bf4ea2795 100644
--- a/panda/src/vrpn/vrpnClient.cxx
+++ b/panda/src/vrpn/vrpnClient.cxx
@@ -60,6 +60,24 @@ VrpnClient::
   delete _connection;
 }
 
+/**
+ * Returns true if everything seems to be kosher with the server (even if
+ * there is no connection), or false otherwise.
+ */
+bool VrpnClient::
+is_valid() const {
+  return (_connection->doing_okay() != 0);
+}
+
+/**
+ * Returns true if the connection is established successfully, false
+ * otherwise.
+ */
+bool VrpnClient::
+is_connected() const {
+  return (_connection->connected() != 0);
+}
+
 /**
  * Writes a list of the active devices that the VrpnClient is currently
  * polling each frame.
diff --git a/panda/src/vrpn/vrpnClient.h b/panda/src/vrpn/vrpnClient.h
index 127492d9cf..979351eac9 100644
--- a/panda/src/vrpn/vrpnClient.h
+++ b/panda/src/vrpn/vrpnClient.h
@@ -38,8 +38,8 @@ PUBLISHED:
   ~VrpnClient();
 
   INLINE const std::string &get_server_name() const;
-  INLINE bool is_valid() const;
-  INLINE bool is_connected() const;
+  bool is_valid() const;
+  bool is_connected() const;
 
   void write(std::ostream &out, int indent_level = 0) const;
 
diff --git a/panda/src/vrpn/vrpnDial.I b/panda/src/vrpn/vrpnDial.I
index 2cb9981826..3813aa02be 100644
--- a/panda/src/vrpn/vrpnDial.I
+++ b/panda/src/vrpn/vrpnDial.I
@@ -27,12 +27,3 @@ INLINE bool VrpnDial::
 is_empty() const {
   return _devices.empty();
 }
-
-/**
- * Polls the connected device.  Normally you should not call this directly;
- * this will be called by the VrpnClient.
- */
-INLINE void VrpnDial::
-poll() {
-  _dial->mainloop();
-}
diff --git a/panda/src/vrpn/vrpnDial.cxx b/panda/src/vrpn/vrpnDial.cxx
index 62b1fe73df..04f19762df 100644
--- a/panda/src/vrpn/vrpnDial.cxx
+++ b/panda/src/vrpn/vrpnDial.cxx
@@ -70,6 +70,15 @@ unmark(VrpnDialDevice *device) {
   }
 }
 
+/**
+ * Polls the connected device.  Normally you should not call this directly;
+ * this will be called by the VrpnClient.
+ */
+void VrpnDial::
+poll() {
+  _dial->mainloop();
+}
+
 /**
  *
  */
diff --git a/panda/src/vrpn/vrpnDial.h b/panda/src/vrpn/vrpnDial.h
index e98fd7d99d..e7be9c8aa1 100644
--- a/panda/src/vrpn/vrpnDial.h
+++ b/panda/src/vrpn/vrpnDial.h
@@ -45,7 +45,7 @@ public:
   void mark(VrpnDialDevice *device);
   void unmark(VrpnDialDevice *device);
 
-  INLINE void poll();
+  void poll();
 
   void output(std::ostream &out) const;
   void write(std::ostream &out, int indent_level = 0) const;
diff --git a/panda/src/vrpn/vrpnTracker.I b/panda/src/vrpn/vrpnTracker.I
index b651121923..89c91084b5 100644
--- a/panda/src/vrpn/vrpnTracker.I
+++ b/panda/src/vrpn/vrpnTracker.I
@@ -28,12 +28,3 @@ INLINE bool VrpnTracker::
 is_empty() const {
   return _devices.empty();
 }
-
-/**
- * Polls the connected device.  Normally you should not call this directly;
- * this will be called by the VrpnClient.
- */
-INLINE void VrpnTracker::
-poll() {
-  _tracker->mainloop();
-}
diff --git a/panda/src/vrpn/vrpnTracker.cxx b/panda/src/vrpn/vrpnTracker.cxx
index e1b08e2a72..046eaf1d69 100644
--- a/panda/src/vrpn/vrpnTracker.cxx
+++ b/panda/src/vrpn/vrpnTracker.cxx
@@ -72,6 +72,15 @@ unmark(VrpnTrackerDevice *device) {
   }
 }
 
+/**
+ * Polls the connected device.  Normally you should not call this directly;
+ * this will be called by the VrpnClient.
+ */
+void VrpnTracker::
+poll() {
+  _tracker->mainloop();
+}
+
 /**
  *
  */
diff --git a/panda/src/vrpn/vrpnTracker.h b/panda/src/vrpn/vrpnTracker.h
index 1b6c30347d..bb6651cff7 100644
--- a/panda/src/vrpn/vrpnTracker.h
+++ b/panda/src/vrpn/vrpnTracker.h
@@ -45,7 +45,7 @@ public:
   void mark(VrpnTrackerDevice *device);
   void unmark(VrpnTrackerDevice *device);
 
-  INLINE void poll();
+  void poll();
 
   void output(std::ostream &out) const;
   void write(std::ostream &out, int indent_level = 0) const;