[XDCTOOLS-130] GT_TRACE is currently disabled and we have to start building with VS 2015 to add it back
diff --git a/src/packages/xdc/services/host/lib/gld.c b/src/packages/xdc/services/host/lib/gld.c
index ac7f939..ee239bc 100644
--- a/src/packages/xdc/services/host/lib/gld.c
+++ b/src/packages/xdc/services/host/lib/gld.c
@@ -1,3 +1,14 @@
+/* --COPYRIGHT--,EPL
+ * Copyright (c) 2008-2018 Texas Instruments Incorporated
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *      Texas Instruments - initial implementation
+ *
+ * --/COPYRIGHT--*/
 /*
  *  ======== gld.c ========
  *
@@ -14,14 +25,13 @@
 
 #if defined(xdc_target__os_Windows)
 #include <windows.h>
-#include <io.h>		/* access() declaration */
+#include <io.h>         /* access() declaration */
 #else
-#include <dlfcn.h>	/* dlopen() declarations */
-#include <unistd.h>	/* access() declaration */
+#include <dlfcn.h>      /* dlopen() declarations */
+#include <unistd.h>     /* access() declaration */
 #endif
 
-#define GT_TRACE 0
-#define GT_ASSERT 0
+#define GT_TRACE 1
 #include <gt.h>
 
 #include "gld.h"
@@ -151,7 +161,7 @@
     Char tmpBaseName[MAXNAME + 1];
 
     GT_3trace(curTrace, GT_1CLASS, "findFile(%s, %s, 0x%lx)\n",
-	baseName, searchPath == NULL ? "" : searchPath, pathName);
+        baseName, searchPath == NULL ? "" : searchPath, pathName);
 
     /* if a Windows dll name is passed in try the loading the unadorned
      * name; otherwise, try loading name directly.
@@ -175,14 +185,14 @@
 #endif
 
     if (searchPath == NULL) {
-	return (status);
+        return (status);
     }
 
     /* loop through searchPath trying each directory to locate baseName */
     baseLen = strlen(baseName);
     dir = searchPath;
     while (dir[0] != '\0' && strchr(PATHSEP, dir[0]) != NULL) {
-	dir++;
+        dir++;
     }
     for (dirLen = getDirLen(dir); dirLen != 0; dirLen = getDirLen(dir)) {
 	if ((dirLen + baseLen + 1) <= MAXNAME) {
@@ -216,7 +226,7 @@
     String end;
 
     if ((end = strpbrk(dir, PATHSEP)) == NULL) {
-	return (strlen(dir));
+        return (strlen(dir));
     }
     return (end - dir);
 }
diff --git a/src/packages/xdc/xs/tcf.c b/src/packages/xdc/xs/tcf.c
index 5e402ee..0c184c4 100644
--- a/src/packages/xdc/xs/tcf.c
+++ b/src/packages/xdc/xs/tcf.c
@@ -20,8 +20,7 @@
  */
 #include <xdc/std.h>
 
-#define GT_TRACE    0
-#define GT_ASSERT 0
+#define GT_TRACE    1
 #include <xdc/services/host/lib/gt.h>
 #include <xdc/services/host/lib/gs.h>
 #include <xdc/services/host/lib/gld.h>
@@ -43,9 +42,9 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#define MAXOPTIONS  64			/* max options for JVM */
-#define MAXNAME	    512			/* maximum file name length */
-#define MAXCMD	    1024		/* max cmd displayed for -n option */
+#define MAXOPTIONS  64                  /* max options for JVM */
+#define MAXNAME	    512                 /* maximum file name length */
+#define MAXCMD	    1024                /* max cmd displayed for -n option */
 
 #define MAXPATH	    (3 * MAXNAME + 3)	/* enough for 3 names */
 #define MAXOPTLEN   (MAXPATH + 128)	/* enough for 1 path */
@@ -487,7 +486,7 @@
 
     /* handle any exceptions by displaying to stderr and clear it */
     if ((*ses->env)->ExceptionOccurred(ses->env)) {
-	(*ses->env)->ExceptionDescribe(ses->env);
+        (*ses->env)->ExceptionDescribe(ses->env);
     }
 
     buf[i] = '\0';	    /* NULL terminate the output string */
@@ -579,7 +578,7 @@
     String dummy;
 
     GT_4trace(curTrace, GT_ENTER, "TCF_start(0x%lx, 0x%lx, 0x%lx, 0x%lx)\n",
-	tcf, argc, argv, error);
+        tcf, argc, argv, error);
 
     /* ensure that error is never NULL */
     if (error == NULL) {
@@ -751,7 +750,7 @@
     VMFxn newVMFxn;
 
     GT_3trace(curTrace, GT_ENTER, "createVM(0x%lx, %s, 0x%lx)\n",
-	tcf, jvmPath, options);
+        tcf, jvmPath, options);
 
     /* count number of options in options array */
     for (i = 0; i < MAXOPTIONS; i++) {
diff --git a/src/packages/xdc/xs/xs.c b/src/packages/xdc/xs/xs.c
index 6ef6e2d..fe90819 100644
--- a/src/packages/xdc/xs/xs.c
+++ b/src/packages/xdc/xs/xs.c
@@ -1,5 +1,5 @@
 /* --COPYRIGHT--,EPL
- *  Copyright (c) 2008 Texas Instruments and others.
+ *  Copyright (c) 2008-2018 Texas Instruments Incorporated
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -26,7 +26,7 @@
  *
  *  Internal options are subject to change and are intended for internal
  *  use only.  Internal options always begin with '--'.
- * 
+ *
  *  External options are documented and must not be changed without a
  *  means for achieving backward compatibility with existing uses of xs.
  *  External options never begin with '--'.
@@ -77,8 +77,7 @@
  *      Running main() function in module Main in package pkg:
  *          xs pkg
  */
-#define GT_TRACE 0
-#define GT_ASSERT 0
+#define GT_TRACE 1
 
 #include <xdc/std.h>
 #include <tcf.h>
@@ -99,7 +98,7 @@
 #define CALLBACK    __stdcall           /* Win32 callbacks use pascal conv */
 #else
 #define DIRSTR      "/"
-#define CALLBACK    
+#define CALLBACK
 #endif
 
 #if defined(xdc_target__os_Linux)
@@ -218,7 +217,7 @@
 
     init();
 
-    /* The maximum number of pointers we may need is all of argv and three 
+    /* The maximum number of pointers we may need is all of argv and three
      * additional ones.
      */
     nargv = (String *)malloc(sizeof(String) * (argc + 3));
@@ -267,13 +266,13 @@
             case 'h': {
                 usage();
                 return (0);
-                break;                  
+                break;
             }
 
             case 'v': {
                 printVersion();
                 return(0);
-                break;  
+                break;
             }
             case 'p': {
                 /* add argv[1] to pathTab array (used to locate files) */
@@ -305,7 +304,7 @@
                     }
                     strcpy(xdcroot, &argv[0][11]);
                 }
-                
+
                 /* If xdc.traceGroups is passed, and 'bench' is in it, the
                  * trace option is passed to Shell.
                  */
@@ -352,9 +351,9 @@
                             usage();
                             error(1, "illegal option %s\n\n", argv[0]);
                         }
-                        break;                  
+                        break;
                     }
-                    
+
                     case 'j': {
                         if (argc <= 1) {
                             usage();
@@ -392,7 +391,7 @@
                         argc -= 1;
                         break;
                     }
-                    
+
                     /* --xdcpath (or deprecated --xp) specifies XDCPATH */
                     case 'x': {
                         Int xpSize = 0;