diff --git a/src/libCom/fdmgr/fdmgr.cpp b/src/libCom/fdmgr/fdmgr.cpp
index 56870b8d7..2d9245bd3 100644
--- a/src/libCom/fdmgr/fdmgr.cpp
+++ b/src/libCom/fdmgr/fdmgr.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 //
-//      $Id$
 //
 //      File descriptor management C++ class library
 //      (for multiplexing IO in a single threaded environment)
@@ -25,6 +24,7 @@
 
 #include <stddef.h>
 #define epicsExportSharedSymbols
+#include "locationException.h"
 #include "epicsAssert.h"
 #include "fdManager.h"
 #include "fdmgr.h"
diff --git a/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp b/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
index ecdef00ea..2308ca0ff 100644
--- a/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
+++ b/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/
 
 /*  
- *  $Id$
  *
  *                              
  *                    L O S  A L A M O S
@@ -35,6 +34,7 @@
 #include "epicsGuard.h"
 #include "tsDLList.h"
 #include "tsFreeList.h"
+#include "errlog.h"
 
 // - this class implements the asynchronous DNS query
 // - it completes early with the host name in dotted IP address form 
diff --git a/src/libCom/timer/timer.cpp b/src/libCom/timer/timer.cpp
index dbbf7cb9d..de38f103d 100644
--- a/src/libCom/timer/timer.cpp
+++ b/src/libCom/timer/timer.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/
 
 /*
- *      $Id$
  *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
@@ -24,6 +23,7 @@
 #define epicsExportSharedSymbols
 #include "epicsGuard.h"
 #include "timerPrivate.h"
+#include "errlog.h"
 
 #ifdef _MSC_VER
 #   pragma warning ( push )
diff --git a/src/libCom/timer/timerQueue.cpp b/src/libCom/timer/timerQueue.cpp
index c4f69eb0a..911faf4b0 100644
--- a/src/libCom/timer/timerQueue.cpp
+++ b/src/libCom/timer/timerQueue.cpp
@@ -8,13 +8,14 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Id$
  *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
  *              505 665 1831
  */
 
+#include <stdio.h>
+
 #define epicsExportSharedSymbols
 #include "epicsGuard.h"
 #include "timerPrivate.h"
diff --git a/src/libCom/timer/timerQueueActive.cpp b/src/libCom/timer/timerQueueActive.cpp
index 7b04eddbc..aa6e83af0 100644
--- a/src/libCom/timer/timerQueueActive.cpp
+++ b/src/libCom/timer/timerQueueActive.cpp
@@ -8,13 +8,14 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Id$
  *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
  *              505 665 1831
  */
 
+#include <stdio.h>
+
 #define epicsExportSharedSymbols
 #include "timerPrivate.h"
 
diff --git a/src/libCom/timer/timerQueuePassive.cpp b/src/libCom/timer/timerQueuePassive.cpp
index c6e8697eb..192f2bbe5 100644
--- a/src/libCom/timer/timerQueuePassive.cpp
+++ b/src/libCom/timer/timerQueuePassive.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Id$
  *
  *      Author  Jeffrey O. Hill
  *              johill@lanl.gov
@@ -23,6 +22,8 @@
 // in pool.
 // 
 
+#include <stdio.h>
+
 #define epicsExportSharedSymbols
 #include "timerPrivate.h"