diff -cr xorg-server-1.16.4/dix/devices.c xorg-server-1.16.4-spiky/dix/devices.c
*** xorg-server-1.16.4/dix/devices.c	2015-02-10 15:32:05.000000000 -0800
--- xorg-server-1.16.4-spiky/dix/devices.c	2015-09-26 12:12:12.966198239 -0700
***************
*** 456,462 ****
      TouchEndPhysicallyActiveTouches(dev);
      ReleaseButtonsAndKeys(dev);
      SyncRemoveDeviceIdleTime(dev->idle_counter);
!     dev->idle_counter = NULL;
  
      /* float attached devices */
      if (IsMaster(dev)) {
--- 456,465 ----
      TouchEndPhysicallyActiveTouches(dev);
      ReleaseButtonsAndKeys(dev);
      SyncRemoveDeviceIdleTime(dev->idle_counter);
!     if (dev->idle_counter) {
!         FreeResource(dev->idle_counter->sync.id, dev->idle_counter->sync.type);
!         dev->idle_counter = NULL;
!     }
  
      /* float attached devices */
      if (IsMaster(dev)) {
diff -cr xorg-server-1.16.4/debian/changelog xorg-server-1.16.4-spiky/debian/changelog
*** xorg-server-1.16.4/debian/changelog	2015-09-26 14:04:31.000000000 -0700
--- xorg-server-1.16.4-spiky/debian/changelog	2015-09-26 11:45:41.786250390 -0700
***************
*** 1,3 ****
--- 1,10 ----
+ xorg-server (2:1.16.4-1.1) UNRELEASED; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Trying to remove the SyncCounters when they're destroyed.
+ 
+  -- Spiky Caterpillar  Sat, 26 Sep 2015 11:45:09 -0700
+ 
  xorg-server (2:1.16.4-1) unstable; urgency=high
  
    * New upstream release