diff --git a/core/src/lib/parse_conf.h b/core/src/lib/parse_conf.h
index 2a36831df88..4230be8d63c 100644
--- a/core/src/lib/parse_conf.h
+++ b/core/src/lib/parse_conf.h
@@ -405,8 +405,8 @@ class DLL_IMP_EXP ConfigurationParser {
 
    int32_t r_first_;                   /* First daemon resource type */
    int32_t r_last_;                    /* Last daemon resource type */
-   ResourceTable *resources_;              /* Pointer to table of permitted resources */
-   CommonResourceHeader **res_head_;                    /* Pointer to defined resources */
+   ResourceTable *resources_;          /* Pointer to table of permitted resources */
+   CommonResourceHeader **res_head_;   /* Pointer to defined resources */
    brwlock_t res_lock_;                /* Resource lock */
 
    /*
diff --git a/core/src/lib/rwlock.h b/core/src/lib/rwlock.h
index 44b14eaaeef..2d22c13513f 100644
--- a/core/src/lib/rwlock.h
+++ b/core/src/lib/rwlock.h
@@ -43,20 +43,22 @@ typedef struct s_rwlock_tag {
    int               w_active;        /* writers active */
    int               r_wait;          /* readers waiting */
    int               w_wait;          /* writers waiting */
+   s_rwlock_tag() {
+      mutex = PTHREAD_MUTEX_INITIALIZER;
+      read = PTHREAD_COND_INITIALIZER;
+      write = PTHREAD_COND_INITIALIZER;
+      writer_id = 0;
+      priority = 0;
+      valid = 0;
+      r_active = 0;
+      w_active = 0;
+      r_wait = 0;
+      w_wait = 0;
+   };
 } brwlock_t;
 
-typedef struct s_rwsteal_tag {
-   pthread_t         writer_id;       /* writer's thread id */
-   int               state;
-} brwsteal_t;
-
-
 #define RWLOCK_VALID  0xfacade
 
-#define RWL_INIIALIZER \
-   { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, \
-     PTHREAD_COND_INITIALIZER, RWLOCK_VALID, 0, 0, 0, 0 }
-
 #define RwlWritelock(x)     RwlWritelock_p((x), __FILE__, __LINE__)
 
 /**