diff --git a/examples/ezusb.c b/examples/ezusb.c
index 931a86af..7505fa0a 100644
--- a/examples/ezusb.c
+++ b/examples/ezusb.c
@@ -471,9 +471,9 @@ static int parse_iic(FILE *image, void *context,
 }
 
 /* the parse call will be selected according to the image type */
-int (*parse[IMG_TYPE_MAX])(FILE *image, void *context, bool (*is_external)(uint32_t addr, size_t len),
-	int (*poke)(void *context, uint32_t addr, bool external, const unsigned char *data, size_t len))
-	= { parse_ihex, parse_iic, parse_bin };
+static int (*parse[IMG_TYPE_MAX])(FILE *image, void *context, bool (*is_external)(uint32_t addr, size_t len),
+           int (*poke)(void *context, uint32_t addr, bool external, const unsigned char *data, size_t len))
+           = { parse_ihex, parse_iic, parse_bin };
 
 /*****************************************************************************/
 
diff --git a/examples/xusb.c b/examples/xusb.c
index bdb97949..4df65c48 100644
--- a/examples/xusb.c
+++ b/examples/xusb.c
@@ -48,9 +48,9 @@
 #define usb_interface interface
 
 // Global variables
-bool binary_dump = false;
-bool extra_info = false;
-const char* binary_name = NULL;
+static bool binary_dump = false;
+static bool extra_info = false;
+static const char* binary_name = NULL;
 
 static int perr(char const *format, ...)
 {
@@ -128,14 +128,14 @@ static uint8_t cdb_length[256] = {
 	00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,  //  F
 };
 
-enum test_type {
+static enum test_type {
 	USE_GENERIC,
 	USE_PS3,
 	USE_XBOX,
 	USE_SCSI,
 	USE_HID,
 } test_mode;
-uint16_t VID, PID;
+static uint16_t VID, PID;
 
 static void display_buffer_hex(unsigned char *buffer, unsigned size)
 {
diff --git a/libusb/core.c b/libusb/core.c
index e29e8df2..4f2f366a 100644
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -56,7 +56,7 @@ const struct usbi_os_backend * const usbi_backend = &wince_backend;
 #endif
 
 struct libusb_context *usbi_default_context = NULL;
-const struct libusb_version libusb_version_internal =
+static const struct libusb_version libusb_version_internal =
 	{ LIBUSB_MAJOR, LIBUSB_MINOR, LIBUSB_MICRO, LIBUSB_NANO,
 	  LIBUSB_RC, "http://libusbx.org" };
 static int default_context_refcnt = 0;
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 65954285..ba07e8ff 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10794
+#define LIBUSB_NANO 10795