diff --git a/trick_source/trick_swig/PrimitiveAttributesMap.hh b/include/trick/swig/PrimitiveAttributesMap.hh
similarity index 100%
rename from trick_source/trick_swig/PrimitiveAttributesMap.hh
rename to include/trick/swig/PrimitiveAttributesMap.hh
diff --git a/trick_source/trick_swig/cast_as.i b/include/trick/swig/cast_as.i
similarity index 100%
rename from trick_source/trick_swig/cast_as.i
rename to include/trick/swig/cast_as.i
diff --git a/trick_source/trick_swig/extra_functions.i b/include/trick/swig/extra_functions.i
similarity index 100%
rename from trick_source/trick_swig/extra_functions.i
rename to include/trick/swig/extra_functions.i
diff --git a/trick_source/trick_swig/swig_class_typedef.i b/include/trick/swig/swig_class_typedef.i
similarity index 100%
rename from trick_source/trick_swig/swig_class_typedef.i
rename to include/trick/swig/swig_class_typedef.i
diff --git a/trick_source/trick_swig/swig_convert_units.hh b/include/trick/swig/swig_convert_units.hh
similarity index 100%
rename from trick_source/trick_swig/swig_convert_units.hh
rename to include/trick/swig/swig_convert_units.hh
diff --git a/trick_source/trick_swig/swig_double.hh b/include/trick/swig/swig_double.hh
similarity index 100%
rename from trick_source/trick_swig/swig_double.hh
rename to include/trick/swig/swig_double.hh
diff --git a/trick_source/trick_swig/swig_extend_str.i b/include/trick/swig/swig_extend_str.i
similarity index 100%
rename from trick_source/trick_swig/swig_extend_str.i
rename to include/trick/swig/swig_extend_str.i
diff --git a/trick_source/trick_swig/swig_global_vars.hh b/include/trick/swig/swig_global_vars.hh
similarity index 100%
rename from trick_source/trick_swig/swig_global_vars.hh
rename to include/trick/swig/swig_global_vars.hh
diff --git a/trick_source/trick_swig/swig_int.hh b/include/trick/swig/swig_int.hh
similarity index 100%
rename from trick_source/trick_swig/swig_int.hh
rename to include/trick/swig/swig_int.hh
diff --git a/trick_source/trick_swig/swig_int_templates.hh b/include/trick/swig/swig_int_templates.hh
similarity index 100%
rename from trick_source/trick_swig/swig_int_templates.hh
rename to include/trick/swig/swig_int_templates.hh
diff --git a/trick_source/trick_swig/swig_int_typemap.i b/include/trick/swig/swig_int_typemap.i
similarity index 99%
rename from trick_source/trick_swig/swig_int_typemap.i
rename to include/trick/swig/swig_int_typemap.i
index b4e2db97..7298fec7 100644
--- a/trick_source/trick_swig/swig_int_typemap.i
+++ b/include/trick/swig/swig_int_typemap.i
@@ -6,16 +6,16 @@
 %{
 #include <iostream>
 
-#include "trick_swig/swig_int.hh"
-#include "trick_swig/swig_double.hh"
-#include "trick_swig/swig_ref.hh"
-#include "trick_swig/PrimitiveAttributesMap.hh"
+#include "trick/swig/swig_int.hh"
+#include "trick/swig/swig_double.hh"
+#include "trick/swig/swig_ref.hh"
+#include "trick/swig/PrimitiveAttributesMap.hh"
 #include "trick/UnitsMap.hh"
 #include "trick/Unit.hh"
 #include "trick/reference.h"
 #include "trick/memorymanager_c_intf.h"
 
-#include "trick_swig/swig_int_templates.hh"
+#include "trick/swig/swig_int_templates.hh"
 
 %}
 
diff --git a/trick_source/trick_swig/swig_macros.hh b/include/trick/swig/swig_macros.hh
similarity index 100%
rename from trick_source/trick_swig/swig_macros.hh
rename to include/trick/swig/swig_macros.hh
diff --git a/trick_source/trick_swig/swig_ref.hh b/include/trick/swig/swig_ref.hh
similarity index 100%
rename from trick_source/trick_swig/swig_ref.hh
rename to include/trick/swig/swig_ref.hh
diff --git a/trick_source/trick_swig/trick_swig.i b/include/trick/swig/trick_swig.i
similarity index 95%
rename from trick_source/trick_swig/trick_swig.i
rename to include/trick/swig/trick_swig.i
index 17c4d653..52bbe013 100644
--- a/trick_source/trick_swig/trick_swig.i
+++ b/include/trick/swig/trick_swig.i
@@ -5,10 +5,10 @@
 %include "std_string.i"
 %include "std_vector.i"
 
-%include "trick_swig/swig_extend_str.i"
-%include "trick_swig/swig_class_typedef.i"
-%include "trick_swig/cast_as.i"
-%include "trick_swig/swig_int_typemap.i"
+%include "trick/swig/swig_extend_str.i"
+%include "trick/swig/swig_class_typedef.i"
+%include "trick/swig/cast_as.i"
+%include "trick/swig/swig_int_typemap.i"
 
 /* SWIG can't understand GNU C keyword "__attribute__" */
 #ifdef SWIG
@@ -25,7 +25,6 @@
 #include "trick/memorymanager_c_intf.h"
 #include "trick/PythonPrint.hh"
 
-
 #ifndef SWIG_as_voidptr 
 #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) 
 #endif
diff --git a/trick_source/trick_swig/units_attach.i b/include/trick/swig/units_attach.i
similarity index 98%
rename from trick_source/trick_swig/units_attach.i
rename to include/trick/swig/units_attach.i
index a822a82f..bede4d08 100644
--- a/trick_source/trick_swig/units_attach.i
+++ b/include/trick/swig/units_attach.i
@@ -6,7 +6,7 @@
 
 %inline %{
 #include "trick/Unit.hh"
-#include "trick_swig/swig_double.hh"
+#include "trick/swig/swig_double.hh"
 %}
 
 %inline %{
diff --git a/libexec/trick/convert_swig b/libexec/trick/convert_swig
index 5ac849a8..acdaa799 100755
--- a/libexec/trick/convert_swig
+++ b/libexec/trick/convert_swig
@@ -444,7 +444,7 @@ sub process_file($$) {
         print OUT "\%module m$md5_sum\n\n" ;
         print OUT "/* $in_file */\n" ;
 
-        print OUT "#include \"trick_swig/trick_swig.i\"\n\n" ;
+        print OUT "#include \"trick/swig/trick_swig.i\"\n\n" ;
 
         print OUT "
 \%{
diff --git a/share/trick/makefiles/Makefile.common b/share/trick/makefiles/Makefile.common
index dab150a2..0bbb4a2c 100644
--- a/share/trick/makefiles/Makefile.common
+++ b/share/trick/makefiles/Makefile.common
@@ -128,7 +128,7 @@ ifeq ($(HAVE_GSL),1)
   TRICK_EXEC_LINK_LIBS += -lgsl -lgslcblas
 endif
 
-TRICK_INCLUDE = $(shell $(PERL) -e '@inc_paths = "${TRICK_CFLAGS}" =~ /-I\s*(\S+)/g ; foreach $$i (@inc_paths) { print "-I$$i "}')
+TRICK_INCLUDE = $(shell $(PERL) -e '@inc_paths = "${TRICK_CFLAGS}" =~ /-I\s*(\S+)/g ; foreach $$i (@inc_paths) { print "-I$$i " if (-e $$i)}')
 TRICK_DEFINES = $(shell $(PERL) -e '@defines = "${TRICK_CFLAGS}" =~ /-D\s*(\S+)/g ; foreach $$i (@defines) { print "-D$$i "}')
 
 IO_SRC_DIR     := io_src/
diff --git a/trick_source/trick_swig/Makefile b/trick_source/trick_swig/Makefile
index fdc607ec..7cb78233 100644
--- a/trick_source/trick_swig/Makefile
+++ b/trick_source/trick_swig/Makefile
@@ -68,7 +68,7 @@ $(OBJECT_FILES): $(OBJ_DIR)/%.o : %.cpp
 	$(TRICK_CPPC) $(TRICK_CXXFLAGS) -c $< -o $@
 
 $(SWIG_SRC_FILES): swig_${TRICK_HOST_CPU}/%_wrap.cpp : %.i
-	 $(SWIG) $(SWIG_DEFS) -I${TRICK_HOME}/trick_source -I${TRICK_HOME}/include -c++ -python -includeall -ignoremissing -w201,362,389,451 -o $@ -outdir ${TRICK_HOME}/share/trick/swig $<
+	 $(SWIG) $(SWIG_DEFS) -I${TRICK_HOME}/trick_source -I${TRICK_HOME}/include -I${TRICK_HOME} -c++ -python -includeall -ignoremissing -w201,362,389,451 -o $@ -outdir ${TRICK_HOME}/share/trick/swig $<
 
 $(TRICK_LIB) : $(SWIG_OBJECT_FILES) $(OBJECT_FILES)
 	ar crs $@ $?
diff --git a/trick_source/trick_swig/PrimitiveAttributesMap.cpp b/trick_source/trick_swig/PrimitiveAttributesMap.cpp
index 8fcb4ab8..f3508d80 100644
--- a/trick_source/trick_swig/PrimitiveAttributesMap.cpp
+++ b/trick_source/trick_swig/PrimitiveAttributesMap.cpp
@@ -1,6 +1,6 @@
 
 #include <string.h>
-#include "PrimitiveAttributesMap.hh"
+#include "trick/swig/PrimitiveAttributesMap.hh"
 
 // Global instance.  This isn't a singleton, but the only one that works with attributes_map.
 Trick::PrimitiveAttributesMap attr_map ;
diff --git a/trick_source/trick_swig/sim_services.i b/trick_source/trick_swig/sim_services.i
index b7d75fd8..ae70fa64 100644
--- a/trick_source/trick_swig/sim_services.i
+++ b/trick_source/trick_swig/sim_services.i
@@ -1,11 +1,11 @@
 
 %module sim_services
 
-#include "trick_swig/trick_swig.i"
-#include "trick_swig/units_attach.i"
-#include "trick_swig/extra_functions.i"
-#include "trick_swig/swig_class_typedef.i"
-#include "trick_swig/cast_as.i"
+#include "trick/swig/trick_swig.i"
+#include "trick/swig/units_attach.i"
+#include "trick/swig/extra_functions.i"
+#include "trick/swig/swig_class_typedef.i"
+#include "trick/swig/cast_as.i"
 
 // Special typemap for collectee in add_collect and delete_collect.
 %typemap(in) void * collectee {
@@ -26,7 +26,7 @@
 }
 
 %inline %{
-#include "trick_swig/swig_global_vars.hh"
+#include "trick/swig/swig_global_vars.hh"
 
 #include "trick/reference_frame.h"
 #include "trick/rand_generator.h"
diff --git a/trick_source/trick_swig/swig_double.cpp b/trick_source/trick_swig/swig_double.cpp
index ecb3f795..33bbfd11 100644
--- a/trick_source/trick_swig/swig_double.cpp
+++ b/trick_source/trick_swig/swig_double.cpp
@@ -1,9 +1,9 @@
 
 #include <iostream>
-#include "trick_swig/swig_macros.hh"
-#include "trick_swig/swig_double.hh"
-#include "trick_swig/swig_int.hh"
-#include "trick_swig/swig_convert_units.hh"
+#include "trick/swig/swig_macros.hh"
+#include "trick/swig/swig_double.hh"
+#include "trick/swig/swig_int.hh"
+#include "trick/swig/swig_convert_units.hh"
 
 #include "trick/Unit.hh"
 
diff --git a/trick_source/trick_swig/swig_double.i b/trick_source/trick_swig/swig_double.i
index b05f2250..81fdc769 100644
--- a/trick_source/trick_swig/swig_double.i
+++ b/trick_source/trick_swig/swig_double.i
@@ -3,7 +3,7 @@
 
 %{
 
-#include "trick_swig/swig_double.hh"
+#include "trick/swig/swig_double.hh"
 #include "trick_swig/swig_double.cpp"
 
 %}
diff --git a/trick_source/trick_swig/swig_int.cpp b/trick_source/trick_swig/swig_int.cpp
index b31a6b34..bbab178e 100644
--- a/trick_source/trick_swig/swig_int.cpp
+++ b/trick_source/trick_swig/swig_int.cpp
@@ -1,9 +1,9 @@
 
 #include <iostream>
-#include "trick_swig/swig_macros.hh"
-#include "trick_swig/swig_int.hh"
-#include "trick_swig/swig_double.hh"
-#include "trick_swig/swig_convert_units.hh"
+#include "trick/swig/swig_macros.hh"
+#include "trick/swig/swig_int.hh"
+#include "trick/swig/swig_double.hh"
+#include "trick/swig/swig_convert_units.hh"
 
 #include "trick/Unit.hh"
 
diff --git a/trick_source/trick_swig/swig_int.i b/trick_source/trick_swig/swig_int.i
index dcdd5da9..f88783d4 100644
--- a/trick_source/trick_swig/swig_int.i
+++ b/trick_source/trick_swig/swig_int.i
@@ -3,7 +3,7 @@
 
 %{
 
-#include "trick_swig/swig_int.hh"
+#include "trick/swig/swig_int.hh"
 #include "trick_swig/swig_int.cpp"
 
 %}
diff --git a/trick_source/trick_swig/swig_ref.cpp b/trick_source/trick_swig/swig_ref.cpp
index 2083ff31..1667d381 100644
--- a/trick_source/trick_swig/swig_ref.cpp
+++ b/trick_source/trick_swig/swig_ref.cpp
@@ -5,10 +5,10 @@
 #include <Python.h>
 #include <stdlib.h>
 
-#include "trick_swig/swig_ref.hh"
-#include "trick_swig/swig_double.hh"
-#include "trick_swig/swig_int.hh"
-#include "trick_swig/swig_convert_units.hh"
+#include "trick/swig/swig_ref.hh"
+#include "trick/swig/swig_double.hh"
+#include "trick/swig/swig_int.hh"
+#include "trick/swig/swig_convert_units.hh"
 #include "trick/MemoryManager.hh"
 #include "trick/memorymanager_c_intf.h"
 #include "trick/PythonPrint.hh"
diff --git a/trick_source/trick_swig/swig_ref.i b/trick_source/trick_swig/swig_ref.i
index 390ef3d3..0ddbe4b1 100644
--- a/trick_source/trick_swig/swig_ref.i
+++ b/trick_source/trick_swig/swig_ref.i
@@ -3,7 +3,7 @@
 
 %{
 
-#include "trick_swig/swig_ref.hh"
+#include "trick/swig/swig_ref.hh"
 #include "trick_swig/swig_ref.cpp"
 
 %}