diff --git a/bindings.i b/bindings.i
index 0766221..9f478c6 100644
--- a/bindings.i
+++ b/bindings.i
@@ -1,47 +1,27 @@
 // Generated by generate-bindings.py - do not edit manually!
 
 // Header file WiringPi/wiringPi/wiringPi.h
-extern int wiringPiFailure (int fatal, const char *message, ...) ;
-extern struct wiringPiNodeStruct *wiringPiFindNode (int pin) ;
-extern struct wiringPiNodeStruct *wiringPiNewNode  (int pinBase, int numPins) ;
-extern void wiringPiVersion	(int *major, int *minor) ;
-extern int  wiringPiSetup       (void) ;
-extern int  wiringPiSetupSys    (void) ;
-extern int  wiringPiSetupGpio   (void) ;
-extern int  wiringPiSetupPhys   (void) ;
-extern          void pinModeAlt          (int pin, int mode) ;
-extern          void pinMode             (int pin, int mode) ;
-extern          void pullUpDnControl     (int pin, int pud) ;
-extern          int  digitalRead         (int pin) ;
-extern          void digitalWrite        (int pin, int value) ;
-extern          void pwmWrite            (int pin, int value) ;
-extern          int  analogRead          (int pin) ;
-extern          void analogWrite         (int pin, int value) ;
-extern          int  piGpioLayout        (void) ;
-extern          int  piBoardRev          (void) ;	// Deprecated
-extern          void piBoardId           (int *model, int *rev, int *mem, int *maker, int *overVolted) ;
-extern          int  wpiPinToGpio        (int wpiPin) ;
-extern          int  physPinToGpio       (int physPin) ;
-extern          void setPadDrive         (int group, int value) ;
-extern          int  getAlt              (int pin) ;
-extern          void pwmToneWrite        (int pin, int freq) ;
-extern          void pwmSetMode          (int mode) ;
-extern          void pwmSetRange         (unsigned int range) ;
-extern          void pwmSetClock         (int divisor) ;
-extern          void gpioClockSet        (int pin, int freq) ;
-extern unsigned int  digitalReadByte     (void) ;
-extern unsigned int  digitalReadByte2    (void) ;
-extern          void digitalWriteByte    (int value) ;
-extern          void digitalWriteByte2   (int value) ;
-extern int  waitForInterrupt    (int pin, int mS) ;
-extern int  piThreadCreate      (void *(*fn)(void *)) ;
-extern void piLock              (int key) ;
-extern void piUnlock            (int key) ;
-extern int piHiPri (const int pri) ;
-extern void         delay             (unsigned int howLong) ;
-extern void         delayMicroseconds (unsigned int howLong) ;
-extern unsigned int millis            (void) ;
-extern unsigned int micros            (void) ;
+extern          int  msg		(int type, const char *message, ...);
+extern          int  wiringPiFailure	(int fatal, const char *message, ...);
+extern          void wiringPiVersion	(int *major, int *minor);
+extern          void wiringPiSetup	(void);
+extern          int  wiringPiSetupGpio	(void);
+extern          int  wiringPiSetupPhys	(void);
+extern          int  wiringPiSetupSys	(void);
+extern          int  getAlt		(int pin);
+extern          void pinMode		(int pin, int mode);
+extern          void pullUpDnControl	(int pin, int pud);
+extern          int  digitalRead	(int pin);
+extern          void digitalWrite	(int pin, int value);
+extern          int  analogRead		(int pin);
+extern          void digitalWriteByte	(const int value);
+extern unsigned int  digitalReadByte 	(void);
+extern          int  waitForInterrupt	(int pin, int mS);
+extern          void delay		(unsigned int howLong);
+extern          void delayMicrosecondsHard (unsigned int howLong);
+extern          void delayMicroseconds	(unsigned int howLong);
+extern unsigned int  millis		(void);
+extern unsigned int  micros		(void);
 
 // Header file WiringPi/wiringPi/wiringPiI2C.h
 extern int wiringPiI2CRead           (int fd) ;