diff --git a/panda/src/putil/Sources.pp b/panda/src/putil/Sources.pp
index 4e1a33d5e5..37741be6d6 100644
--- a/panda/src/putil/Sources.pp
+++ b/panda/src/putil/Sources.pp
@@ -35,7 +35,7 @@
     ioPtaDatagramShort.h keyboardButton.h lineStream.I \
     lineStream.h lineStreamBuf.I lineStreamBuf.h \
     modifierButtons.I modifierButtons.h mouseButton.h \
-    mouseData.h nameUniquifier.I nameUniquifier.h \
+    mouseData.I mouseData.h nameUniquifier.I nameUniquifier.h \
     ordered_vector.h ordered_vector.I ordered_vector.T \
     pipeline.h pipeline.I \
     pipelineCycler.h pipelineCycler.I \
@@ -104,8 +104,8 @@
     ioPtaDatagramFloat.h ioPtaDatagramInt.h \
     ioPtaDatagramShort.h iterator_types.h keyboardButton.h lineStream.I \
     lineStream.h lineStreamBuf.I lineStreamBuf.h modifierButtons.I \
-    modifierButtons.h mouseButton.h mouseData.h nameUniquifier.I \
-    nameUniquifier.h \
+    modifierButtons.h mouseButton.h mouseData.I mouseData.h \
+    nameUniquifier.I nameUniquifier.h \
     ordered_vector.h ordered_vector.I ordered_vector.T \
     pipeline.h pipeline.I \
     pipelineCycler.h pipelineCycler.I \
diff --git a/panda/src/putil/mouseData.I b/panda/src/putil/mouseData.I
new file mode 100644
index 0000000000..64f88405d1
--- /dev/null
+++ b/panda/src/putil/mouseData.I
@@ -0,0 +1,48 @@
+// Filename: mouseData.I
+// Created by:  drose (15Jul02)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// panda3d@yahoogroups.com .
+//
+////////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseData::get_x
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE int MouseData::
+get_x() const {
+  return _xpos;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseData::get_y
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE int MouseData::
+get_y() const {
+  return _ypos;
+}
+
+////////////////////////////////////////////////////////////////////
+//     Function: MouseData::get_in_window
+//       Access: Published
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE bool MouseData::
+get_in_window() const {
+  return _in_window;
+}
diff --git a/panda/src/putil/mouseData.cxx b/panda/src/putil/mouseData.cxx
index e9d2375a96..5907de9f11 100644
--- a/panda/src/putil/mouseData.cxx
+++ b/panda/src/putil/mouseData.cxx
@@ -20,7 +20,7 @@
 
 ////////////////////////////////////////////////////////////////////
 //     Function: MouseData::Constructor
-//       Access: Public
+//       Access: Published
 //  Description:
 ////////////////////////////////////////////////////////////////////
 MouseData::
diff --git a/panda/src/putil/mouseData.h b/panda/src/putil/mouseData.h
index 8ca3c0adeb..afbe5322c0 100644
--- a/panda/src/putil/mouseData.h
+++ b/panda/src/putil/mouseData.h
@@ -19,7 +19,7 @@
 #ifndef MOUSEDATA_H
 #define MOUSEDATA_H
 
-#include <pandabase.h>
+#include "pandabase.h"
 
 #include "modifierButtons.h"
 
@@ -33,9 +33,9 @@ class EXPCL_PANDA MouseData {
 PUBLISHED:
   MouseData();
 
-  INLINE int get_x() const {return _xpos;};
-  INLINE int get_y() const {return _ypos;};
-  INLINE bool get_in_window() const {return _in_window;};
+  INLINE int get_x() const;
+  INLINE int get_y() const;
+  INLINE bool get_in_window() const;
 
 public:
   bool _in_window;
@@ -43,6 +43,8 @@ public:
   int _ypos;
 };
 
+#include "mouseData.I"
+
 #endif