diff --git a/panda/src/display/Sources.pp b/panda/src/display/Sources.pp
index 887fe0e260..7b79637379 100644
--- a/panda/src/display/Sources.pp
+++ b/panda/src/display/Sources.pp
@@ -13,6 +13,7 @@
   #define SOURCES  \
     standardMunger.I standardMunger.h \
     config_display.h \
+    customGraphicsWindowProc.h \
     drawableRegion.I drawableRegion.h \
     displayRegion.I displayRegion.h  \
     displayRegionCullCallbackData.I displayRegionCullCallbackData.h \
@@ -21,6 +22,7 @@
     graphicsEngine.I graphicsEngine.h \
     graphicsOutput.I graphicsOutput.h \
     graphicsBuffer.I graphicsBuffer.h \
+    graphicsDevice.h graphicsDevice.I \
     graphicsPipe.I graphicsPipe.h  \
     graphicsPipeSelection.I graphicsPipeSelection.h \
     graphicsStateGuardian.I \
@@ -29,7 +31,7 @@
     graphicsWindow.I graphicsWindow.h \
     graphicsWindowInputDevice.I  \
     graphicsWindowInputDevice.h \
-    graphicsDevice.h graphicsDevice.I \
+    graphicsWindowProc.h \
     lru.h \
     nativeWindowHandle.I nativeWindowHandle.h \
     parasiteBuffer.I parasiteBuffer.h \
@@ -41,15 +43,20 @@
     displaySearchParameters.h \
     displayInformation.h \
     subprocessWindow.h subprocessWindow.I \
-    $[if $[OSX_PLATFORM], subprocessWindowBuffer.h subprocessWindowBuffer.I]
+    $[if $[OSX_PLATFORM], subprocessWindowBuffer.h subprocessWindowBuffer.I] \
+    touchInfo.h 
+
     
  #define INCLUDED_SOURCES  \
     standardMunger.cxx \
     config_display.cxx \
+    customGraphicsWindowProc.cxx \
     drawableRegion.cxx \
     displayRegion.cxx \
     displayRegionCullCallbackData.cxx \
     displayRegionDrawCallbackData.cxx \
+    displaySearchParameters.cxx \
+    displayInformation.cxx \
     frameBufferProperties.cxx \
     graphicsEngine.cxx \
     graphicsOutput.cxx \
@@ -59,17 +66,17 @@
     graphicsStateGuardian.cxx  \
     graphicsThreadingModel.cxx \
     graphicsWindow.cxx graphicsWindowInputDevice.cxx  \
+    graphicsWindowProc.cxx \
     graphicsDevice.cxx \
+    lru.cxx \
     nativeWindowHandle.cxx \
     parasiteBuffer.cxx \
     windowHandle.cxx \
     windowProperties.cxx \
-    lru.cxx \
     stencilRenderStates.cxx \
     stereoDisplayRegion.cxx \
-    displaySearchParameters.cxx \
-    displayInformation.cxx \
-    subprocessWindow.cxx
+    subprocessWindow.cxx \
+    touchInfo.cxx
 
   #define INSTALL_HEADERS \
     standardMunger.I standardMunger.h \
diff --git a/panda/src/display/customGraphicsWindowProc.h b/panda/src/display/customGraphicsWindowProc.h
index 71bfa0e255..bc64221fb2 100644
--- a/panda/src/display/customGraphicsWindowProc.h
+++ b/panda/src/display/customGraphicsWindowProc.h
@@ -15,6 +15,7 @@
 #ifndef CUSTOMGRAPHICSWINDOWPROC_H
 #define CUSTOMGRAPHICSWINDOWPROC_H
 
+#include "pandabase.h"
 #include "graphicsWindowProc.h"
 
 class CustomGraphicsWindowProc: public GraphicsWindowProc{
@@ -34,4 +35,4 @@ private:
   PyObject* _name;
 };
 
-#endif //CUSTOMGRAPHICSWINDOWPROC_H
\ No newline at end of file
+#endif //CUSTOMGRAPHICSWINDOWPROC_H
diff --git a/panda/src/display/graphicsEngine.cxx b/panda/src/display/graphicsEngine.cxx
index b1476b084f..b07dcd501b 100644
--- a/panda/src/display/graphicsEngine.cxx
+++ b/panda/src/display/graphicsEngine.cxx
@@ -1564,7 +1564,7 @@ process_events(const GraphicsEngine::Windows &wlist, Thread *current_thread) {
   // We're not using a vector iterator here, since it's possible that
   // the window list changes in an event, which would invalidate the
   // iterator and cause a crash.
-  for (int i = 0; i < wlist.size(); ++i) {
+  for (size_t i = 0; i < wlist.size(); ++i) {
     wlist[i]->process_events();
   }
 }
diff --git a/panda/src/display/touchInfo.cxx b/panda/src/display/touchInfo.cxx
index eeccc3af26..9a766c404f 100644
--- a/panda/src/display/touchInfo.cxx
+++ b/panda/src/display/touchInfo.cxx
@@ -15,40 +15,40 @@
 #include "touchInfo.h"
 
 TouchInfo::TouchInfo(){
-	_x = 0;
-	_y = 0;
-	_id = 0;
-	_flags = 0;
+  _x = 0;
+  _y = 0;
+  _id = 0;
+  _flags = 0;
 }
 
-LONG TouchInfo::get_x(){
-	return _x;
+int TouchInfo::get_x(){
+  return _x;
 }
 
-LONG TouchInfo::get_y(){
-	return _y;
+int TouchInfo::get_y(){
+  return _y;
 }
 
-DWORD TouchInfo::get_id(){
-	return _id;
+int TouchInfo::get_id(){
+  return _id;
 }
 
-DWORD TouchInfo::get_flags(){
-	return _flags;
+int TouchInfo::get_flags(){
+  return _flags;
 }
 
-void TouchInfo::set_x(LONG x){
-	_x = x;
+void TouchInfo::set_x(int x){
+  _x = x;
 }
 
-void TouchInfo::set_y(LONG y){
-	_y = y;
+void TouchInfo::set_y(int y){
+  _y = y;
 }
 
-void TouchInfo::set_id(DWORD id){
-	_id = id;
+void TouchInfo::set_id(int id){
+  _id = id;
 }
 
-void TouchInfo::set_flags(DWORD flags){
-	_flags = flags;
+void TouchInfo::set_flags(int flags){
+  _flags = flags;
 }
diff --git a/panda/src/display/touchInfo.h b/panda/src/display/touchInfo.h
index 1087026813..0fe84ae689 100644
--- a/panda/src/display/touchInfo.h
+++ b/panda/src/display/touchInfo.h
@@ -15,6 +15,8 @@
 #ifndef TOUCHINFO_H
 #define TOUCHINFO_H
 
+#include "pandabase.h"
+
 ////////////////////////////////////////////////////////////////////
 //       Class : TouchInfo
 // Description : Stores information for a single touch event.
@@ -25,32 +27,32 @@ PUBLISHED:
   enum TouchInfoFlags
   {
     TIF_move = 0x0001,
-	TIF_down = 0x0002,
-	TIF_UP = 0x0004,
+    TIF_down = 0x0002,
+    TIF_UP = 0x0004,
   };
 
 public:
 
   TouchInfo();
 
-  void set_x(LONG x);
-  void set_y(LONG y);
-  void set_id(DWORD id);
-  void set_flags(DWORD flags);
+  void set_x(int x);
+  void set_y(int y);
+  void set_id(int id);
+  void set_flags(int flags);
 
 PUBLISHED:
 
-  LONG get_x();
-  LONG get_y();
-  DWORD get_id();
-  DWORD get_flags();
+  int get_x();
+  int get_y();
+  int get_id();
+  int get_flags();
 
 private:
   
-	LONG _x;
-	LONG _y;
-	DWORD _id;
-	DWORD _flags;
+  int _x;
+  int _y;
+  int _id;
+  int _flags;
 };
 
 #endif