diff --git a/src/httpp/httpp.c b/src/httpp/httpp.c
index 9bb83f33..fa6bbcab 100644
--- a/src/httpp/httpp.c
+++ b/src/httpp/httpp.c
@@ -55,7 +55,8 @@ static int split_headers(char *data, unsigned long len, char **line)
 	/* first we count how many lines there are 
 	** and set up the line[] array	 
 	*/
-	int i, lines = 0;
+	int lines = 0;
+    unsigned long i;
 	line[lines] = data;
 	for (i = 0; i < len && lines < MAX_HEADERS; i++) {
 		if (data[i] == '\r')
diff --git a/src/thread/thread.c b/src/thread/thread.c
index 53f44792..e6f42bb6 100644
--- a/src/thread/thread.c
+++ b/src/thread/thread.c
@@ -88,12 +88,15 @@ static int _logid = -1;
 static long _next_thread_id = 0;
 static int _initialized = 0;
 static avl_tree *_threadtree = NULL;
-static mutex_t _threadtree_mutex = { -1, NULL, MUTEX_STATE_UNINIT, NULL, -1 };
+static mutex_t _threadtree_mutex = { -1, NULL, MUTEX_STATE_UNINIT, NULL, -1, 
+    PTHREAD_MUTEX_INITIALIZER};
 
 static long _next_mutex_id = 0;
 static avl_tree *_mutextree = NULL;
-static mutex_t _mutextree_mutex = { -1, NULL, MUTEX_STATE_UNINIT, NULL, -1 };
-static mutex_t _library_mutex = { -1, NULL, MUTEX_STATE_UNINIT, NULL, -1 };
+static mutex_t _mutextree_mutex = { -1, NULL, MUTEX_STATE_UNINIT, NULL, -1,
+    PTHREAD_MUTEX_INITIALIZER};
+static mutex_t _library_mutex = { -1, NULL, MUTEX_STATE_UNINIT, NULL, -1,
+    PTHREAD_MUTEX_INITIALIZER};
 
 /* INTERNAL FUNCTIONS */