diff --git a/.gitignore b/.gitignore
index a0e279c..e267f26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
 
 # ignore shared files that have been copied to host-firmware dirs
 firmware/source/shared_*.h
-host/source/shared_*.h
 
 # ignore trash/temp files stored in host/ignore
 host/ignore
diff --git a/host/Makefile b/host/Makefile
index d442744..f9c4fc0 100644
--- a/host/Makefile
+++ b/host/Makefile
@@ -1,6 +1,6 @@
 #compiler flags: -Wall Warnings all,  -g gdb debug markings, 
 CFLAGS=-Wall -O
-INCLUDE= -I ./include
+INCLUDE= -I ./include -I ../shared
 WINLIB= -L ./winlib
 LIBUSB= -lusb-1.0
 CC= gcc
@@ -13,12 +13,12 @@ LUAOBJ=$(wildcard source/lua/*.o)
 TARGET=inlretro
 
 #default to windows build
-all:	shared
+all:
 	$(CC) $(INCLUDE) $(LUAOBJ) $(SOURCES) -o $(TARGET) $(WINLIB) $(CFLAGS) $(LIBUSB) 
 
 #unix build doesn't need winlib directory as libusb should be installed on OS.
 #sudo apt-get install libusb-1.0-0-dev
-unix:	shared
+unix:
 	$(CC) $(INCLUDE) $(LUAOBJ) $(SOURCES) -o $(TARGET) $(CFLAGS) -lm $(LIBUSB)
 
 # "make debug" will build program with debug print messages
@@ -32,12 +32,6 @@ unixdebug: CFLAGS += -DDEBUG -g
 unixdebug: unix
 
 
-#copy shared .h files which are used in host and firmware
-shared:
-	cp -r ../shared/* source/
-
 #clean on unix and windows(.exe)
 clean:
-	rm -f $(TARGET) $(TARGET).exe $(OBJECTS) $(LUAOBJ)
-	rm -f source/shared_*
-
+	rm -f $(TARGET) $(TARGET).exe $(OBJECTS) $(LUAOBJ)
\ No newline at end of file
diff --git a/host/source/usb_operations.c b/host/source/usb_operations.c
index 2ffa57e..156b5b7 100644
--- a/host/source/usb_operations.c
+++ b/host/source/usb_operations.c
@@ -25,6 +25,8 @@ static libusb_device_handle *lua_usb_handle = NULL;
 libusb_device_handle *open_usb_device( libusb_context *context, int log_level )
 {	
 	int rv = 0;
+	libusb_device_handle *handle = NULL;
+	libusb_device **device_list = NULL;
 
 	//context set to NULL since only acting as single user of libusb
 	//libusb_context *context = NULL;
@@ -60,7 +62,6 @@ libusb_device_handle *open_usb_device( libusb_context *context, int log_level )
 	libusb_set_debug(context, log_level);
 
 	//discover all usb devices
-	libusb_device **device_list = NULL;
 	//ssize_t libusb_get_device_list (libusb_context *ctx, libusb_device ***list)
 	// Returns a list of USB devices currently attached to the system.
 	// return value is number of devices plus one as list is null terminated, or LIBUSB_ERROR if negative.
@@ -75,7 +76,6 @@ libusb_device_handle *open_usb_device( libusb_context *context, int log_level )
 	libusb_device *retroprog = NULL;
 	libusb_device *device = NULL;
 	struct libusb_device_descriptor desc;
-	libusb_device_handle *handle = NULL;
 	const char manf[256];	//used to hold manf/prod strings
 	const char prod[256];	//used to hold manf/prod strings
 		//Original kazzo