diff --git a/src/accountcreator.h b/src/accountcreator.h
index 0023c4e3888d3977f87a01cd8c51bb52c903d724..105de35c1a63c8573ea9bc54fc18df34c89bb8c7 100644
--- a/src/accountcreator.h
+++ b/src/accountcreator.h
@@ -29,12 +29,12 @@ class Account;
  */
 class AccountCreator{
 public:
-    ~AccountCreator();
-   /**
-    * Public account type
-    */
-   enum AccountType {SIP_ACCOUNT, IAX_ACCOUNT };
-
+  ~AccountCreator();
+  /**
+   * Public account type
+   */
+  enum AccountType {SIP_ACCOUNT, IAX_ACCOUNT };
+  
   /**
    * Create a new account or null
    * @param type type of the account
@@ -43,8 +43,8 @@ public:
   static Account* createAccount(AccountType type, AccountID accountID);
 
 private:
-   /** Hidden creator */
-    AccountCreator();
+  /** Hidden creator */
+  AccountCreator();
 };
 
 #endif
diff --git a/src/iaxcall.h b/src/iaxcall.h
index ca6dd24df78637afc12ecd155969abc7a33e2977..61a32287e68e64556bcc71c27fed98533ac869b2 100644
--- a/src/iaxcall.h
+++ b/src/iaxcall.h
@@ -20,7 +20,7 @@
 #define IAXCALL_H
 
 #include "call.h"
-#include <iax-client.h>
+#include <iax/iax-client.h>
 
 /**
  * IAXCall are IAX implementation of a normal Call 
diff --git a/src/iaxvoiplink.cpp b/src/iaxvoiplink.cpp
index 7721ea03218c4fc4ae48809ae60f2d9df63ce0d1..2ccf810a013642491839098e610088eb990c337d 100644
--- a/src/iaxvoiplink.cpp
+++ b/src/iaxvoiplink.cpp
@@ -26,6 +26,11 @@
 #include "audio/audiolayer.h"
 
 #include <samplerate.h>
+#include <iax/iax-client.h>
+
+
+#define IAX_BLOCKING    1
+#define IAX_NONBLOCKING 0
 
 #define IAX_SUCCESS  0
 #define IAX_FAILURE -1
@@ -178,7 +183,7 @@ IAXVoIPLink::getEvent()
 
   iax_event* event = NULL;
   IAXCall* call = NULL;
-  while ( (event = iax_get_event(TRUE)) != NULL ) {
+  while ( (event = iax_get_event(IAX_BLOCKING)) != NULL ) {
     //_debug ("Receive IAX Event: %d\n", event->etype);
     call = iaxFindCallBySession(event->session);
     if (call != 0) {
diff --git a/src/iaxvoiplink.h b/src/iaxvoiplink.h
index 8d95bf33869fb1648b689cf9dd43eceb948c0e86..34351203dd6de16ca018efede9a9a88986a739c6 100644
--- a/src/iaxvoiplink.h
+++ b/src/iaxvoiplink.h
@@ -20,7 +20,7 @@
 #define IAXVOIPLINK_H
 
 #include "voIPLink.h"
-#include <iax-client.h>
+#include <iax/iax-client.h>
 #include "global.h"
 
 
diff --git a/src/user_cfg.h b/src/user_cfg.h
index de05b5d50608d11bc8ddc37e258d4a0bef27946e..0d9319d12b616a73abd31e8d5ff1594370a9219d 100644
--- a/src/user_cfg.h
+++ b/src/user_cfg.h
@@ -69,7 +69,7 @@
 #define CODEC3			"Codecs.codec3"
 #define RING_CHOICE		"Rings.ringChoice"
 #define ACCOUNT_SIP_COUNT_DEFAULT 4
-#define ACCOUNT_IAX_COUNT_DEFAULT 1
+#define ACCOUNT_IAX_COUNT_DEFAULT 4
 
 // speakers and volume 0 to 100
 #define VOLUME_SPKR	"Volume.speakers"