diff --git a/src/build/Common.bmake b/src/build/Common.bmake
index c4259942144150b9241bac0b175db36c92c8b829..6b3ddc3b563f3d3849b11b6dbf6d4d469484b599 100644
--- a/src/build/Common.bmake
+++ b/src/build/Common.bmake
@@ -175,6 +175,9 @@ CIOLIB_SRC	=	$(SRC_ROOT)$(DIRSEP)conio
 SMBLIB_SRC	=	$(SRC_ROOT)$(DIRSEP)smblib
 UIFC_SRC	=	$(SRC_ROOT)$(DIRSEP)uifc
 
+# Pull in lib-specific flags
+!include     $(CIOLIB_SRC)$(DIRSEP)Common.make
+
 .path.c		=	.;$(XPDEV_SRC);$(SMBLIB_SRC);$(CIOLIB_SRC);$(UIFC_SRC)
 .path.cpp	=	.;$(XPDEV_SRC);$(SMBLIB_SRC);$(CIOLIB_SRC);$(UIFC_SRC)
 
diff --git a/src/build/Common.gmake b/src/build/Common.gmake
index f052ebbf84ec079ae32884a6f735f23906cfaef7..9ae6630978b39afedd014f421ba2f00da86028ea 100644
--- a/src/build/Common.gmake
+++ b/src/build/Common.gmake
@@ -218,6 +218,9 @@ CIOLIB_SRC	:=	$(SRC_ROOT)$(DIRSEP)conio
 SMBLIB_SRC	:=	$(SRC_ROOT)$(DIRSEP)smblib
 UIFC_SRC	:=	$(SRC_ROOT)$(DIRSEP)uifc
 
+# Pull in lib-specific flags
+include		$(CIOLIB_SRC)$(DIRSEP)Common.make
+
 ifdef DEBUG
  CFLAGS	+=	-ggdb
  CFLAGS	+=	-D_DEBUG