diff --git a/src/libCom/cxxTemplates/tsBTree.h b/src/libCom/cxxTemplates/tsBTree.h
index 29b7b9c9d..7a7583a57 100644
--- a/src/libCom/cxxTemplates/tsBTree.h
+++ b/src/libCom/cxxTemplates/tsBTree.h
@@ -11,7 +11,6 @@
 #ifndef assert // allow use of epicsAssert.h
 #include <assert.h>
 #endif
-#include "locationException.h"
 
 //
 // tsBTreeRMRet
diff --git a/src/libCom/osi/epicsMessageQueue.h b/src/libCom/osi/epicsMessageQueue.h
index 0c18dd545..3137b3cf8 100644
--- a/src/libCom/osi/epicsMessageQueue.h
+++ b/src/libCom/osi/epicsMessageQueue.h
@@ -28,8 +28,6 @@ typedef struct epicsMessageQueueOSD *epicsMessageQueueId;
 
 #ifdef __cplusplus
 
-#include "locationException.h"
-
 class epicsShareClass epicsMessageQueue {
 public:
     epicsMessageQueue ( unsigned int capacity,
diff --git a/src/libCom/osi/os/default/osdMessageQueue.cpp b/src/libCom/osi/os/default/osdMessageQueue.cpp
index 9f589aaf4..ed599d62d 100644
--- a/src/libCom/osi/os/default/osdMessageQueue.cpp
+++ b/src/libCom/osi/os/default/osdMessageQueue.cpp
@@ -18,6 +18,9 @@
 #include <stdexcept>
 #include <string.h>
 
+#include <stdlib.h>
+#include <stdio.h>
+
 #define epicsExportSharedSymbols
 #include "epicsMessageQueue.h"
 #include <ellLib.h>