diff --git a/bindings.i b/bindings.i
index 0766221..21acb04 100644
--- a/bindings.i
+++ b/bindings.i
@@ -133,8 +133,8 @@ extern void softPwmWrite  (int pin, int value) ;
 extern void softPwmStop   (int pin) ;
 
 // Header file WiringPi/wiringPi/softServo.h
-extern void softServoWrite  (int pin, int value) ;
-extern int softServoSetup   (int p0, int p1, int p2, int p3, int p4, int p5, int p6, int p7) ;
+//extern void softServoWrite  (int pin, int value) ;
+//extern int softServoSetup   (int p0, int p1, int p2, int p3, int p4, int p5, int p6, int p7) ;
 
 // Header file WiringPi/wiringPi/softTone.h
 extern int  softToneCreate (int pin) ;
diff --git a/setup.py b/setup.py
index e7919dd..521d73d 100755
--- a/setup.py
+++ b/setup.py
@@ -9,8 +9,8 @@ from setuptools.command.sdist import sdist
 from distutils.spawn import find_executable
 from glob import glob
 
-sources = glob('WiringPi/devLib/*.c')
-sources += glob('WiringPi/wiringPi/*.c')
+sources = []
+
 # If we have swig, use it.  Otherwise, use the pre-generated
 # wrapper from the source distribution.
 if find_executable('swig'):
@@ -23,12 +23,6 @@ else:
           "        source distribution (on pypi) is available.")
     sys.exit(1)
 
-try:
-    sources.remove('WiringPi/devLib/piFaceOld.c')
-except ValueError:
-    # the file is already excluded in the source distribution
-    pass
-
 
 # Fix so that build_ext runs before build_py
 # Without this, wiringpi.py is generated too late and doesn't
@@ -52,9 +46,8 @@ class sdist_ext_first(sdist):
 
 _wiringpi = Extension(
     '_wiringpi',
-    include_dirs=['WiringPi/wiringPi','WiringPi/devLib'],
     sources=sources,
-    extra_link_args=['-lcrypt', '-lrt']
+    libraries=['crypt', 'rt', 'wiringPi', 'wiringPiDev']
 )
 
 setup(
diff --git a/wiringpi.i b/wiringpi.i
index e34fe3a..fb4bc6c 100644
--- a/wiringpi.i
+++ b/wiringpi.i
@@ -6,51 +6,49 @@
 #define PyString_FromStringAndSize PyBytes_FromStringAndSize
 #endif
 
-#include "WiringPi/wiringPi/wiringPi.h"
-#include "WiringPi/wiringPi/wiringPiI2C.h"
-#include "WiringPi/wiringPi/wiringPiSPI.h"
-#include "WiringPi/wiringPi/wiringSerial.h"
-#include "WiringPi/wiringPi/wiringShift.h"
-#include "WiringPi/wiringPi/drcSerial.h"
-#include "WiringPi/wiringPi/ads1115.h"
-#include "WiringPi/wiringPi/max31855.h"
-#include "WiringPi/wiringPi/max5322.h"
-#include "WiringPi/wiringPi/mcp23008.h"
-#include "WiringPi/wiringPi/mcp23016.h"
-#include "WiringPi/wiringPi/mcp23016reg.h"
-#include "WiringPi/wiringPi/mcp23017.h"
-#include "WiringPi/wiringPi/mcp23s08.h"
-#include "WiringPi/wiringPi/mcp23s17.h"
-#include "WiringPi/wiringPi/mcp23x0817.h"
-#include "WiringPi/wiringPi/mcp23x08.h"
-#include "WiringPi/wiringPi/mcp3002.h"
-#include "WiringPi/wiringPi/mcp3004.h"
-#include "WiringPi/wiringPi/mcp3422.h"
-#include "WiringPi/wiringPi/mcp4802.h"
-#include "WiringPi/wiringPi/pcf8574.h"
-#include "WiringPi/wiringPi/pcf8591.h"
-#include "WiringPi/wiringPi/sn3218.h"
-#include "WiringPi/wiringPi/softPwm.h"
-#include "WiringPi/wiringPi/softServo.h"
-#include "WiringPi/wiringPi/softTone.h"
-#include "WiringPi/wiringPi/sr595.h"
-#include "WiringPi/wiringPi/bmp180.h"
-#include "WiringPi/wiringPi/drcNet.h"
-#include "WiringPi/wiringPi/ds18b20.h"
-#include "WiringPi/wiringPi/htu21d.h"
-#include "WiringPi/wiringPi/pseudoPins.h"
-#include "WiringPi/wiringPi/rht03.h"
-#include "WiringPi/wiringPi/wpiExtensions.h"
-#include "WiringPi/devLib/ds1302.h"
-#include "WiringPi/devLib/font.h"
-#include "WiringPi/devLib/gertboard.h"
-#include "WiringPi/devLib/lcd128x64.h"
-#include "WiringPi/devLib/lcd.h"
-#include "WiringPi/devLib/maxdetect.h"
-#include "WiringPi/devLib/piGlow.h"
-#include "WiringPi/devLib/piNes.h"
-#include "WiringPi/devLib/scrollPhat.h"
-#include "WiringPi/devLib/piFace.h"
+#include "wiringPi.h"
+#include "wiringPiI2C.h"
+#include "wiringPiSPI.h"
+#include "wiringSerial.h"
+#include "wiringShift.h"
+#include "drcSerial.h"
+#include "ads1115.h"
+#include "max31855.h"
+#include "max5322.h"
+#include "mcp23008.h"
+#include "mcp23016.h"
+#include "mcp23016reg.h"
+#include "mcp23017.h"
+#include "mcp23s08.h"
+#include "mcp23s17.h"
+#include "mcp23x0817.h"
+#include "mcp23x08.h"
+#include "mcp3002.h"
+#include "mcp3004.h"
+#include "mcp3422.h"
+#include "mcp4802.h"
+#include "pcf8574.h"
+#include "pcf8591.h"
+#include "sn3218.h"
+#include "softPwm.h"
+#include "softTone.h"
+#include "sr595.h"
+#include "bmp180.h"
+#include "drcNet.h"
+#include "ds18b20.h"
+#include "htu21d.h"
+#include "pseudoPins.h"
+#include "rht03.h"
+#include "wpiExtensions.h"
+#include "ds1302.h"
+#include "gertboard.h"
+#include "lcd128x64.h"
+#include "lcd.h"
+#include "maxdetect.h"
+#include "piGlow.h"
+#include "piNes.h"
+#include "scrollPhat.h"
+#include "piFace.h"
 %}
 
 %apply unsigned char { uint8_t };