diff --git a/AUTHORS b/AUTHORS
index 9996bfb5..0bc73cd7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ Contributors:
 	Hannes Weisbach
 	Doug Springer
 	Brett Hagman <bhagman@roguerobotics.com>
+	Rene Liebscher <r.liebscher@gmx.de>
 
 For minor contributions, please see the ChangeLog files.
 
diff --git a/ChangeLog b/ChangeLog
index bd65e110..dfaa1c5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-03  Rene Liebscher <R.Liebscher@gmx.de>
+
+	* pickit2.c: reordered #includes for non-usb configuration
+
 2012-12-03  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* jtag3.c: Enable interactive adjustment of the various
diff --git a/NEWS b/NEWS
index b6061b33..9b9147da 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,8 @@ Current:
         X3(1), sck = DSR X3(2), mosi = DCD X3(3), reset = RI X3(4))
       + diecimila (alias for arduino-ft232r)
 
+    - pickit2
+
     - Atmel JTAGICE3
 
   * Bugfixes
diff --git a/pickit2.c b/pickit2.c
index 91264cf7..acbddcc3 100644
--- a/pickit2.c
+++ b/pickit2.c
@@ -45,23 +45,16 @@
 
 #include "ac_cfg.h"
 
-#if defined(HAVE_LIBUSB) || (defined(WIN32NATIVE) && defined(HAVE_LIBHID))
-
-#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <time.h>
 #include <inttypes.h>
 
 #include "avrdude.h"
 #include "avr.h"
 #include "pgm.h"
-#include "usbdevs.h"
+
+#if defined(HAVE_LIBUSB) || (defined(WIN32NATIVE) && defined(HAVE_LIBHID))
 
 #if (defined(WIN32NATIVE) && defined(HAVE_LIBHID))
 #include <windows.h>