diff --git a/xs/src/Shiny/ShinyManager.c b/xs/src/Shiny/ShinyManager.c
index 8ee9e59aa9..d60bf9da7f 100644
--- a/xs/src/Shiny/ShinyManager.c
+++ b/xs/src/Shiny/ShinyManager.c
@@ -22,16 +22,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#if SHINY_IS_COMPILED == TRUE
+
 #include "ShinyManager.h"
 
-// #include <malloc.h>
+#include <malloc.h>
 #include <memory.h>
 #include <string.h>
 #include <stdio.h>
 
-#if SHINY_IS_COMPILED == TRUE
-
-
 /*---------------------------------------------------------------------------*/
 
 #define TABLE_SIZE_INIT		256
diff --git a/xs/src/Shiny/ShinyNode.c b/xs/src/Shiny/ShinyNode.c
index 8c6a67bd4b..0cb595366b 100644
--- a/xs/src/Shiny/ShinyNode.c
+++ b/xs/src/Shiny/ShinyNode.c
@@ -22,15 +22,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#if SHINY_IS_COMPILED == TRUE
+
 #include "ShinyNode.h"
 #include "ShinyZone.h"
 #include "ShinyNodeState.h"
 
 #include <memory.h>
 
-
-#if SHINY_IS_COMPILED == TRUE
-
 /*---------------------------------------------------------------------------*/
 
 ShinyNode _ShinyNode_dummy = {
diff --git a/xs/src/Shiny/ShinyNodePool.c b/xs/src/Shiny/ShinyNodePool.c
index 5a495ccb42..4858196022 100644
--- a/xs/src/Shiny/ShinyNodePool.c
+++ b/xs/src/Shiny/ShinyNodePool.c
@@ -22,14 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#if SHINY_IS_COMPILED == TRUE
+
 #include "ShinyNodePool.h"
 #include "ShinyTools.h"
 
 #include <memory.h>
-// #include <malloc.h>
-
-#if SHINY_IS_COMPILED == TRUE
-
+#include <malloc.h>
 
 /*---------------------------------------------------------------------------*/
 
diff --git a/xs/src/Shiny/ShinyNodeState.c b/xs/src/Shiny/ShinyNodeState.c
index 7e0d0f3e24..83009bef5f 100644
--- a/xs/src/Shiny/ShinyNodeState.c
+++ b/xs/src/Shiny/ShinyNodeState.c
@@ -22,14 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#if SHINY_IS_COMPILED == TRUE
+
 #include "ShinyNodeState.h"
 #include "ShinyNode.h"
 #include "ShinyZone.h"
 
-// #include <malloc.h>
-
-
-#if SHINY_IS_COMPILED == TRUE
+#include <malloc.h>
 
 /*---------------------------------------------------------------------------*/
 
diff --git a/xs/src/Shiny/ShinyOutput.c b/xs/src/Shiny/ShinyOutput.c
index f3de582ee3..9137b6f587 100644
--- a/xs/src/Shiny/ShinyOutput.c
+++ b/xs/src/Shiny/ShinyOutput.c
@@ -43,7 +43,7 @@ THE SOFTWARE.
 #define OUTPUT_WIDTH_CALL	6
 #define OUTPUT_WIDTH_TIME	6
 #define OUTPUT_WIDTH_PERC	4
-#define OUTPUT_WIDTH_SUM	79
+#define OUTPUT_WIDTH_SUM	120 
 
 #define OUTPUT_WIDTH_DATA	(1+OUTPUT_WIDTH_CALL + 1 + 2*(OUTPUT_WIDTH_TIME+4+OUTPUT_WIDTH_PERC+1) + 1)
 #define OUTPUT_WIDTH_NAME	(OUTPUT_WIDTH_SUM - OUTPUT_WIDTH_DATA)
diff --git a/xs/src/Shiny/ShinyZone.c b/xs/src/Shiny/ShinyZone.c
index 132fe56c03..83906d6da4 100644
--- a/xs/src/Shiny/ShinyZone.c
+++ b/xs/src/Shiny/ShinyZone.c
@@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#if SHINY_IS_COMPILED == TRUE
+
 #include "ShinyZone.h"
 
 #include <memory.h>
 
-#if SHINY_IS_COMPILED == TRUE
-
 /*---------------------------------------------------------------------------*/
 
 void ShinyZone_preUpdateChain(ShinyZone *first) {