diff --git a/test/SIM_demo_inputfile/models/InputProcessSimObject/src/InputProcessSimObject.cpp b/test/SIM_demo_inputfile/models/InputProcessSimObject/src/InputProcessSimObject.cpp
index 3aa27783..44ac37f6 100644
--- a/test/SIM_demo_inputfile/models/InputProcessSimObject/src/InputProcessSimObject.cpp
+++ b/test/SIM_demo_inputfile/models/InputProcessSimObject/src/InputProcessSimObject.cpp
@@ -1,5 +1,6 @@
-
+#ifndef TRICK_ICG
 #include <Python.h>
+#endif
 #include <iostream>
 #include <sstream>
 
diff --git a/test/SIM_test_sched/models/sched/src/sched_amf.c b/test/SIM_test_sched/models/sched/src/sched_amf.c
index 8b5ba8f6..ed2dfdc4 100644
--- a/test/SIM_test_sched/models/sched/src/sched_amf.c
+++ b/test/SIM_test_sched/models/sched/src/sched_amf.c
@@ -9,6 +9,7 @@ PROGRAMMERS:                 ( (Keith Vetter) (Titan) (8-20-2002) )
 
 #include "../include/sched.h"
 #include "sim_services/UnitTest/include/trick_tests.h"
+#include <stdio.h>
 
 int sched_amf(
                   /* RETURN: -- Always return zero */
diff --git a/test/SIM_test_sched/models/sched/src/sched_async.c b/test/SIM_test_sched/models/sched/src/sched_async.c
index a8eae53e..8541a0ff 100644
--- a/test/SIM_test_sched/models/sched/src/sched_async.c
+++ b/test/SIM_test_sched/models/sched/src/sched_async.c
@@ -8,6 +8,7 @@ PROGRAMMERS:                 ( (Keith Vetter) (Titan) (8-20-2002) )
 *******************************************************************************/
 
 #include "../include/sched.h"
+#include <unistd.h>
 
 int sched_async (
                   /* RETURN: -- Always return zero */
diff --git a/trick_source/data_products/DPX/test/unit_test/makefile b/trick_source/data_products/DPX/test/unit_test/makefile
index 2590ba02..ae671026 100644
--- a/trick_source/data_products/DPX/test/unit_test/makefile
+++ b/trick_source/data_products/DPX/test/unit_test/makefile
@@ -32,7 +32,7 @@ endif
 ifeq ($(TRICK_HOST_TYPE), Darwin)
     CFLAGS += -DGTEST_HAS_TR1_TUPLE=0
     MOTIF_INCDIR = -I/sw/include
-    XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib -lXt -lX11
+    XLIBS = -L/sw/lib -lXm -L/usr/X11R6/lib -L/usr/X11/lib
     SDK_DIR = $(shell xcrun --show-sdk-path)
     INCDIRS += -I${SDK_DIR}/usr/include/libxml2
 else