diff --git a/src/Makefile b/src/Makefile
index 27f070cac..7d839c8ab 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -52,7 +52,7 @@ DIRS += ioc/dbtemplate
 ioc/dbtemplate_DEPEND_DIRS = ioc/db
 
 DIRS += ca/client/tools
-ca/client/tools_DEPEND_DIRS = ca/client ioc/dbStatic
+ca/client/tools_DEPEND_DIRS = ca/client
 
 DIRS += ioc/rsrv
 ioc/rsrv_DEPEND_DIRS = ioc/as
@@ -82,13 +82,13 @@ DIRS += ca/legacy/gdd
 ca/legacy/gdd_DEPEND_DIRS = ca/client
 
 DIRS += ca/legacy/pcas
-ca/legacy/pcas_DEPEND_DIRS = ca/legacy/gdd ioc/dbStatic
+ca/legacy/pcas_DEPEND_DIRS = ca/legacy/gdd
 
 DIRS += ca/legacy/pcas/ex
 ca/legacy/pcas/ex_DEPEND_DIRS = ca/legacy/pcas ioc/as ioc/registry
 
 DIRS += ca/client/perl
-ca/client/perl_DEPEND_DIRS = ca/client ioc/dbStatic
+ca/client/perl_DEPEND_DIRS = ca/client
 
 
 include $(TOP)/configure/RULES_DIRS
diff --git a/src/ioc/dbStatic/Makefile b/src/ioc/dbStatic/Makefile
index 364b8364f..0caaa4b21 100644
--- a/src/ioc/dbStatic/Makefile
+++ b/src/ioc/dbStatic/Makefile
@@ -10,8 +10,6 @@ TOP=../../..
 
 include $(TOP)/configure/CONFIG
 
-INC += alarm.h
-INC += alarmString.h
 INC += dbBase.h
 INC += dbFldTypes.h
 INC += dbStaticLib.h
diff --git a/src/libCom/Makefile b/src/libCom/Makefile
index 380cbdac4..87ed4ff01 100644
--- a/src/libCom/Makefile
+++ b/src/libCom/Makefile
@@ -134,6 +134,8 @@ SRCS += macEnv.c
 SRCS += macUtil.c
 
 SRC_DIRS += $(LIBCOM)/misc
+INC += alarm.h
+INC += alarmString.h
 INC += adjustment.h
 INC += cantProceed.h
 INC += dbDefs.h
diff --git a/src/ioc/dbStatic/alarm.h b/src/libCom/misc/alarm.h
similarity index 100%
rename from src/ioc/dbStatic/alarm.h
rename to src/libCom/misc/alarm.h
diff --git a/src/ioc/dbStatic/alarmString.h b/src/libCom/misc/alarmString.h
similarity index 100%
rename from src/ioc/dbStatic/alarmString.h
rename to src/libCom/misc/alarmString.h