--- xnu/xnu-12377.101.15/iokit/IOKit/Makefile
+++ xnu/xnu-792/iokit/IOKit/Makefile
@@ -2,6 +2,10 @@
 export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
 export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
+
+IOKIT_FRAMEDIR = $(FRAMEDIR)/IOKit.framework/Versions/A
+export INCDIR = $(IOKIT_FRAMEDIR)/Headers
+export LCLDIR = $(IOKIT_FRAMEDIR)/PrivateHeaders
 
 include $(MakeInc_cmd)
 include $(MakeInc_def)
@@ -12,49 +16,31 @@
 	power \
 	pwr_mgt \
 	rtc \
-	system_management \
-	skywalk
+	system_management
 
+INSTINC_SUBDIRS_PPC = \
+	ppc
+
+INSTINC_SUBDIRS_I386 = \
+	i386
 
 EXPINC_SUBDIRS = ${INSTINC_SUBDIRS}
+EXPINC_SUBDIRS_PPC = ${INSTINC_SUBDIRS_PPC}
+EXPINC_SUBDIRS_I386 = ${INSTINC_SUBDIRS_I386}
 
-# By default, everything in xnu/iokit/IOKit gets installed into
-# Kernel.framework/Headers/IOKit AND Kernel.framework/PrivateHeaders/IOKit.
-# This is so the files with #ifdef ...PRIVATE portions can be processed.
-# xnu/README documents the INSTALL* and EXPORT_MI_DIR lists.
-ALL_HEADERS = $(notdir $(wildcard $(SOURCE)*.h))
+NOT_EXPORT_HEADERS = 
 
-# Do not install these headers (anywhere).
-NOT_EXPORT_HEADERS = IOInterruptAccountingPrivate.h
+NOT_KF_MI_HEADERS  = $(NOT_EXPORT_HEADERS) IOKitKeysPrivate.h IOCPU.h IOPolledInterface.h
 
-# Install these only in Kernel.framework's PrivateHeaders (not Headers).
-NOT_KF_MI_HEADERS  = $(NOT_EXPORT_HEADERS)			\
-		     IOKitKeysPrivate.h IOCPU.h			\
-		     IOHibernatePrivate.h IOPolledInterface.h	\
-		     IOCommandQueue.h IOLocksPrivate.h		\
-		     IOSyncer.h AppleKeyStoreInterface.h	\
-		     IOStatistics.h IOStatisticsPrivate.h	\
-		     IOKernelReporters.h			\
-		     IOInterruptAccounting.h			\
-		     IOPlatformIO.h				\
-		     IOPMGR.h IOPlatformActions.h 	\
-		     IOExtensiblePaniclog.h
+NOT_LOCAL_HEADERS = 
 
+ALL_HEADERS = $(shell (cd $(SOURCE); echo *.h))
 
-# These should be additionally installed in IOKit.framework's public Headers
-INSTALL_IF_MI_LIST	= IOBSD.h IOKitKeys.h IOKitServer.h IOReturn.h	    \
-		  IOSharedLock.h IOTypes.h IOMapTypes.h OSMessageNotification.h  \
-		  IODataQueueShared.h IOMessage.h IORPC.h IOUserServer.h
-
-# These should be additionally installed in IOKit.framework's PrivateHeaders
-INSTALL_IF_MI_LCL_LIST = $(INSTALL_IF_MI_LIST)
-INSTALL_IF_MI_LCL_LIST += \
-		      IOKitKeysPrivate.h IOHibernatePrivate.h   \
-		      IOLocksPrivate.h IOStatistics.h 		\
-		      AppleKeyStoreInterface.h  		\
-		      IOReportTypes.h IOKernelReportStructs.h   \
-		      IOReportMacros.h IOInterruptAccounting.h \
-		      IOCircularDataQueue.h IOCircularDataQueueImplementation.h
+INSTALL_MI_LIST	= IOBSD.h IOKitKeys.h IOKitServer.h IOReturn.h\
+		  IOSharedLock.h IOTypes.h OSMessageNotification.h\
+		  IODataQueueShared.h IOMessage.h
+                  
+INSTALL_MI_LCL_LIST = IOKitKeysPrivate.h
 
 INSTALL_MI_DIR = .