diff --git a/src/build/Common.bmake b/src/build/Common.bmake
index 994c57353f1681bcb692bd1f371998ba2470c473..87910c076d42153ced6510c2930c415be2767227 100644
--- a/src/build/Common.bmake
+++ b/src/build/Common.bmake
@@ -78,6 +78,12 @@
 #  DIRSEP			- The directory seperator this system likes most		#
 #  VERSION			- Synchronet version number in MAJOR.MINOR format		#
 #					  (Numeric ONLY)										#
+#  OUTPUT			- Compiler flag specifying output filename				#
+#  LOUTPUT			- Linker flag specifying output filename				#
+#  XPDEV_SRC		- Path to xpdev											#
+#  UIFC_SRC			- Path to uifc											#
+#  CIOLIB_SRC		- Path to ciolib										#
+#  SMBLIB_SRC		- Path to smblib										#
 #																			#
 # Common Targets Defined:													#
 #  Implicit C and C++ targets												#
@@ -158,9 +164,15 @@ BUILDPATH	=	debug
 BUILDPATH	=	release
 !endif
 
-LIBODIR :=	$(CCPRE).win32.lib.$(BUILDPATH)
-OBJODIR :=	$(CCPRE).win32.obj.$(BUILDPATH)$(OBJPATH_SUFFIX)
-EXEODIR :=	$(CCPRE).win32.exe.$(BUILDPATH)
+LIBODIR =	$(CCPRE).win32.lib.$(BUILDPATH)
+OBJODIR =	$(CCPRE).win32.obj.$(BUILDPATH)$(OBJPATH_SUFFIX)
+EXEODIR =	$(CCPRE).win32.exe.$(BUILDPATH)
+
+# Paths
+XPDEV_SRC	=	$(SRC_ROOT)$(DIRSEP)xpdev
+CIOLIB_SRC	=	$(SRC_ROOT)$(DIRSEP)conio
+SMBLIB_SRC	=	$(SRC_ROOT)$(DIRSEP)smblib
+UIFC_SRC	=	$(SRC_ROOT)$(DIRSEP)uifc
 
 !include targets.mk
 !include $(SRC_ROOT)/build/rules.mk
diff --git a/src/build/Common.gmake b/src/build/Common.gmake
index 8753e2a2368456faa99356ee973391387e7ec553..f052ebbf84ec079ae32884a6f735f23906cfaef7 100644
--- a/src/build/Common.gmake
+++ b/src/build/Common.gmake
@@ -80,6 +80,10 @@
 #					  (Numeric ONLY)										#
 #  OUTPUT			- Compiler flag specifying output filename				#
 #  LOUTPUT			- Linker flag specifying output filename				#
+#  XPDEV_SRC		- Path to xpdev											#
+#  UIFC_SRC			- Path to uifc											#
+#  CIOLIB_SRC		- Path to ciolib										#
+#  SMBLIB_SRC		- Path to smblib										#
 #																			#
 # Common Targets Defined:													#
 #  Implicit C and C++ targets												#
@@ -208,6 +212,12 @@ ifeq ($(os),darwin)
  LDFLAGS +=  -lm
 endif
 
+# Paths
+XPDEV_SRC	:=	$(SRC_ROOT)$(DIRSEP)xpdev
+CIOLIB_SRC	:=	$(SRC_ROOT)$(DIRSEP)conio
+SMBLIB_SRC	:=	$(SRC_ROOT)$(DIRSEP)smblib
+UIFC_SRC	:=	$(SRC_ROOT)$(DIRSEP)uifc
+
 ifdef DEBUG
  CFLAGS	+=	-ggdb
  CFLAGS	+=	-D_DEBUG