diff --git a/.gitignore b/.gitignore
index 7ebd4036..35d1eb0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ lib_Darwin_*
 *.swp
 *.dox
 Makefile_jsc_dirs
+.DS_Store
diff --git a/trick_source/sim_services/CheckPointRestart/src/CheckPointRestart_c_intf.cpp b/trick_source/sim_services/CheckPointRestart/src/CheckPointRestart_c_intf.cpp
index 54c2c296..dfac92a4 100644
--- a/trick_source/sim_services/CheckPointRestart/src/CheckPointRestart_c_intf.cpp
+++ b/trick_source/sim_services/CheckPointRestart/src/CheckPointRestart_c_intf.cpp
@@ -5,6 +5,7 @@
 #include "sim_services/CheckPointRestart/include/CheckPointRestart_c_intf.hh"
 #include "sim_services/MemoryManager/include/memorymanager_c_intf.h"
 #include "sim_services/Message/include/message_proto.h"
+#include "sim_services/Message/include/message_type.h"
 
 /** Global singleton pointer to the CheckPointRestart. */
 extern Trick::CheckPointRestart * the_cpr ;
diff --git a/trick_source/sim_services/Clock/src/GetTimeOfDayClock.cpp b/trick_source/sim_services/Clock/src/GetTimeOfDayClock.cpp
index 9bf425dd..0afb190b 100644
--- a/trick_source/sim_services/Clock/src/GetTimeOfDayClock.cpp
+++ b/trick_source/sim_services/Clock/src/GetTimeOfDayClock.cpp
@@ -16,6 +16,7 @@ PROGRAMMERS:
 
 #include "sim_services/Clock/include/GetTimeOfDayClock.hh"
 #include "sim_services/Message/include/message_proto.h"
+#include "sim_services/Message/include/message_type.h"
 
 /**
 @details
diff --git a/trick_source/sim_services/Message/include/message_proto.h b/trick_source/sim_services/Message/include/message_proto.h
index 2e0df887..5d7ddfc4 100644
--- a/trick_source/sim_services/Message/include/message_proto.h
+++ b/trick_source/sim_services/Message/include/message_proto.h
@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include "message_type.h"
 
 #ifdef __cplusplus
 extern "C" {