diff --git a/src/arm.c b/src/arm.c
index c523c00..27ad762 100644
--- a/src/arm.c
+++ b/src/arm.c
@@ -109,7 +109,6 @@ int ieee1394_arm_set_buf (struct ieee1394_handle *handle, nodeaddr_t start,
                          size_t length, void *buf)
 {
         struct raw1394_request req;
-        int status;
 
         CLEAR_REQ(&req);
 
@@ -139,7 +138,6 @@ int ieee1394_arm_get_buf (struct ieee1394_handle *handle, nodeaddr_t start,
                          size_t length, void *buf)
 {
         struct raw1394_request req;
-        int status;
 
         CLEAR_REQ(&req);
 
diff --git a/src/dispatch.c b/src/dispatch.c
index 567fbbc..17e8af8 100644
--- a/src/dispatch.c
+++ b/src/dispatch.c
@@ -71,7 +71,7 @@ void raw1394_destroy_handle(raw1394handle_t handle)
 raw1394handle_t raw1394_new_handle_on_port(int port)
 {
 	ieee1394handle_t ieee1394_handle = ieee1394_new_handle_on_port(port);
-	fw_handle_t fw_handle = NULL;
+	fw_handle_t fw_handle;
 	raw1394handle_t handle = NULL;
 
 	if (ieee1394_handle) {
@@ -82,7 +82,7 @@ raw1394handle_t raw1394_new_handle_on_port(int port)
 		} else
 			ieee1394_destroy_handle(ieee1394_handle);
 	}
-	else if (fw_handle = fw_new_handle_on_port(port)) {
+	else if ((fw_handle = fw_new_handle_on_port(port))) {
 		handle = (raw1394handle_t) malloc(sizeof(struct raw1394_handle));
 		if (handle) {
 			handle->is_fw = 1;
diff --git a/src/eventloop.c b/src/eventloop.c
index 43a9519..81bb881 100644
--- a/src/eventloop.c
+++ b/src/eventloop.c
@@ -32,7 +32,7 @@ int ieee1394_loop_iterate(struct raw1394_handle *handle)
 {
         struct raw1394_request req;
         ieee1394handle_t ihandle = handle->mode.ieee1394;
-        int retval = 0, channel;
+        int retval = 0;
 
         while (read(ihandle->fd, &req, sizeof(req)) < 0) {
                 if (errno != EINTR) return -1;
diff --git a/src/fw-iso.c b/src/fw-iso.c
index a2ea38f..1022ebf 100644
--- a/src/fw-iso.c
+++ b/src/fw-iso.c
@@ -85,7 +85,8 @@ queue_xmit_packets(raw1394handle_t handle, int limit)
 	fw_handle_t fwhandle = handle->mode.fw;
 	enum raw1394_iso_disposition d;
 	unsigned char tag, sy;
-	int len, cycle = -1;
+	unsigned int len;
+	int cycle = -1;
 	unsigned int dropped = 0;
 
 	if (fwhandle->iso.xmit_handler == NULL)
@@ -258,9 +259,7 @@ int fw_iso_xmit_write(raw1394handle_t handle, unsigned char *data,
 			   unsigned char sy)
 {
 	fw_handle_t fwhandle = handle->mode.fw;
-	struct fw_cdev_queue_iso queue_iso;
 	struct fw_cdev_start_iso start_iso;
-	struct fw_cdev_iso_packet *p;
 	int retval;
 
 	if (len > fwhandle->iso.max_packet_size) {
diff --git a/src/main.c b/src/main.c
index 55b4fbc..d83256e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -253,9 +253,7 @@ void *raw1394_get_userdata(struct raw1394_handle *handle)
 int ieee1394_get_port_info(struct ieee1394_handle *handle, 
                           struct raw1394_portinfo *pinf, int maxports)
 {
-        int num;
         struct raw1394_request req;
-        struct raw1394_khost_list *khl;
 
         CLEAR_REQ(&req);
         req.type = RAW1394_REQ_LIST_CARDS;