diff --git a/ef/Runtime/System/md/x86/Makefile b/ef/Runtime/System/md/x86/Makefile
index 06abb3800e2c..e2002c4c0f44 100644
--- a/ef/Runtime/System/md/x86/Makefile
+++ b/ef/Runtime/System/md/x86/Makefile
@@ -31,28 +31,33 @@ LOCAL_MD_EXPORTS_x86 =  x86SysCallsRuntime.h			\
 
 MODULE_NAME = EF
 
-#######################################################################
-# (2) Include "component" configuration information.                  #
-#######################################################################
-
 include $(DEPTH)/config/config.mk
 
 #######################################################################
 # (3) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
+ifeq ($(OS_ARCH),Linux)
+ASFILES	=	x86LinuxException.s					\
+		x86LinuxInvokeNative.s					\
+		$(NULL)
 
+CPPSRCS	+= 	x86LinuxThread.cpp					\
+		$(NULL)
 
-#######################################################################
-# (4) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
+LOCAL_MD_EXPORTS_x86 +=  	x86LinuxThread.h			\
+				$(NULL)
+
+endif
+
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS	+= 	Win32ExceptionHandler.cpp                               \
+		x86Win32InvokeNative.cpp				\
+		x86Win32Thread.cpp					\
+		$(NULL)
+
+LOCAL_MD_EXPORTS_x86 +=  	x86Win32Thread.h			\
+				$(NULL)
+endif
 
 include $(DEPTH)/config/rules.mk
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-
-
-
diff --git a/ef/Runtime/System/md/x86/config.mk b/ef/Runtime/System/md/x86/config.mk
deleted file mode 100644
index 30faa7dfeeed..000000000000
--- a/ef/Runtime/System/md/x86/config.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# 
-#           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
-#              NETSCAPE COMMUNICATIONS CORPORATION
-# Copyright (C) 1996 Netscape Communications Corporation.  All Rights
-# Reserved.  Use of this Source Code is subject to the terms of the
-# applicable license agreement from Netscape Communications Corporation.
-# The copyright notice(s) in this Source Code does not indicate actual or
-# intended publication of this Source Code.
-#
-
-ifeq ($(OS_ARCH),Linux)
-ASFILES	=	x86LinuxException.s					\
-		x86LinuxInvokeNative.s					\
-		$(NULL)
-
-CPPSRCS	+= 	x86LinuxThread.cpp					\
-		$(NULL)
-
-LOCAL_MD_EXPORTS_x86 +=  	x86LinuxThread.h			\
-				$(NULL)
-
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-CPPSRCS	+= 	Win32ExceptionHandler.cpp                               \
-		x86Win32InvokeNative.cpp				\
-		x86Win32Thread.cpp					\
-		$(NULL)
-
-LOCAL_MD_EXPORTS_x86 +=  	x86Win32Thread.h			\
-				$(NULL)
-endif
-
-
-