diff --git a/epsoneplijs/Makefile.in b/epsoneplijs/Makefile.in
index 26b9de8..86ef0f1 100644
--- a/epsoneplijs/Makefile.in
+++ b/epsoneplijs/Makefile.in
@@ -69,34 +69,15 @@ ijs_server_example$(EXE):	ijs_server_example$(OBJ) ijs_server$(OBJ) $(IJS_COMMON
 ijs_server_epsonepl$(EXE): ijs_server_epsonepl$(OBJ) ijs_server$(OBJ) $(IJS_COMMON_OBJ) $(EPL_OBJS) $(EXTRA_DEPS) $(EPL_HEADERS)
 	$(CC) $(CFLAGS) $(FE)ijs_server_epsonepl$(EXE) ijs_server_epsonepl$(OBJ) ijs_server$(OBJ) $(EPL_OBJS) $(IJS_COMMON_OBJ) $(LDPATH) $(LDLIBS)
 
-testlibusb$(OBJ): libusb/tests/testlibusb.c
-	$(CC) $(CFLAGS) -c -I./libusb -o testlibusb$(OBJ) libusb/tests/testlibusb.c
-
-testlibusb$(EXE): testlibusb$(OBJ) libusb/.libs/libusb.a
-	$(CC) $(CFLAGS) $(FE)testlibusb$(EXE) testlibusb$(OBJ) $(LDPATH) $(LDLIBS)
-
 #test5700lusb doesn't need a .o.c target as the source is in the same directory.
-test5700lusb$(EXE): test5700lusb$(OBJ) libusb/.libs/libusb.a
+test5700lusb$(EXE): test5700lusb$(OBJ)
 	$(CC) $(CFLAGS) $(FE)test5700lusb$(EXE) test5700lusb$(OBJ) $(LDPATH) $(LDLIBS)
 
-# libusb.spec is a generated file that interfers with rpm building. Therefore removing as soon as possible 
-libusb/.libs/libusb.a:
-	(cd libusb ; ./autogen.sh ; ./configure --disable-shared --disable-build-docs; make)
-	$(RM) libusb/libusb.spec
-
-
-# libieee1284.spec is a generated file that interfers with rpm building. Therefore removing as soon as possible 
-libieee1284/.libs/libieee1284.a:
-	(cd libieee1284 ; ./autogen.sh ; ./configure --disable-shared ; make)
-	$(RM) libieee1284/libieee1284.spec
-
 common_clean:
 	$(RM) *$(OBJ) ijs_client_example$(EXE) ijs_server_example$(EXE) ijs_server_epsonepl$(EXE) *.epl
 
 clean: common_clean
-	$(RM) *~ gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux libijs.a libijs$(SHARED_OBJ) config.cache config.log config.status ijs-config testlibusb$(EXE) test5700lusb$(EXE) libieee1284/lib1284.spec 
-	[ -d libusb ] && (cd libusb ; make clean) || true
-	[ -d libieee1284 ] && (cd libieee1284 ; make clean) || true
+	$(RM) *~ gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux libijs.a libijs$(SHARED_OBJ) config.cache config.log config.status ijs-config test5700lusb$(EXE)
 
 install: all
 	$(INSTALL) ijs_server_epsonepl$(EXE) -c $(bindir)/ijs_server_epsonepl$(EXE)
diff --git a/epsoneplijs/configure.in b/epsoneplijs/configure.in
index 2cb3dc3..8547f18 100644
--- a/epsoneplijs/configure.in
+++ b/epsoneplijs/configure.in
@@ -54,11 +54,9 @@ AC_ARG_WITH(libusb,[  --with-libusb           enable  libusb support (requires l
   --without-libusb        disable libusb and full-feature USB support])
 
 AC_MSG_CHECKING(for libusb)
-if test "$with_libusb" != no -a -d libusb -a -f libusb/usb.h ; then
+if test "$with_libusb" != no -a -f /usr/include/usb.h ; then
 HAVE_LIBUSB="-DHAVE_LIBUSB -D_SVID_SOURCE"
-LIBUSB_EXTRA_LDPATH=-L./libusb/.libs
 LIBUSB_EXTRA_LDLIBS=-lusb
-LIBUSB_EXTRA_DEPS=libusb/.libs/libusb.a 
 LIBUSB_EXTRA_OBJS=epl_utils_libusb.o
 LIBUSB_EXTRA_BINS=
 BID_EXTRA_OBJS=${BID_OBJS}
@@ -90,11 +88,9 @@ AC_ARG_WITH(libieee1284,[  --with-libieee1284      enable  libieee1284 support (
   --without-libieee1284   disable libieee1284 and full-feature parallel port support])
 
 AC_MSG_CHECKING(for libieee1284)
-if test "$with_libieee1284" != no -a -d libieee1284 -a -f libieee1284/include/ieee1284.h ; then
+if test "$with_libieee1284" != no -a -f /usr/include/ieee1284.h ; then
 HAVE_LIBIEEE1284="-DHAVE_LIBIEEE1284"
-LIBIEEE1284_EXTRA_LDPATH=-L./libieee1284/.libs
 LIBIEEE1284_EXTRA_LDLIBS=-lieee1284
-LIBIEEE1284_EXTRA_DEPS=libieee1284/.libs/libieee1284.a 
 LIBIEEE1284_EXTRA_OBJS=epl_utils_libieee1284.o
 LIBIEEE1284_EXTRA_BINS= 
 BID_EXTRA_OBJS=${BID_OBJS}
diff --git a/epsoneplijs/epl_config.h b/epsoneplijs/epl_config.h
index 6e2c2cb..f527924 100644
--- a/epsoneplijs/epl_config.h
+++ b/epsoneplijs/epl_config.h
@@ -123,11 +123,11 @@
 
 
 #ifdef HAVE_LIBUSB
-#include "libusb/usb.h"
+#include <usb.h>
 #endif 
 
 #ifdef HAVE_LIBIEEE1284
-#include "libieee1284/include/ieee1284.h"
+#include <ieee1284.h>
 #endif 
 
 #if defined(HAVE_LIBUSB) || defined(HAVE_KERNEL_USB_DEVICE) || defined(HAVE_LIBIEEE1284) || defined(HAVE_KERNEL_1284) || defined(HAVE_NULLTRANS)
diff --git a/epsoneplijs/epl_utils_libieee1284.c b/epsoneplijs/epl_utils_libieee1284.c
index daadd80..fa70ead 100644
--- a/epsoneplijs/epl_utils_libieee1284.c
+++ b/epsoneplijs/epl_utils_libieee1284.c
@@ -41,7 +41,7 @@
 
 #include <errno.h>
 
-#include "libieee1284/include/ieee1284.h"
+#include <ieee1284.h>
 
 typedef struct parport typ_parport;
 typedef struct parport_list typ_parport_list;
diff --git a/epsoneplijs/epl_utils_libusb.c b/epsoneplijs/epl_utils_libusb.c
index ae93be7..7b391cd 100644
--- a/epsoneplijs/epl_utils_libusb.c
+++ b/epsoneplijs/epl_utils_libusb.c
@@ -25,7 +25,7 @@
  * SOFTWARE.
 **/
 
-#include "libusb/usb.h"
+#include <usb.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/epsoneplijs/test5700lusb.c b/epsoneplijs/test5700lusb.c
index 22184d5..76c5ee4 100644
--- a/epsoneplijs/test5700lusb.c
+++ b/epsoneplijs/test5700lusb.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include "libusb/usb.h"
+#include <usb.h>
 
 void print_endpoint(struct usb_endpoint_descriptor *endpoint);
 void print_altsetting(struct usb_interface_descriptor *interface);