Use <machine/*.h> instead of <i386/include/*.h>.

sys/i386/include/mpapic.h

@@ -22,14 +22,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mpapic.h,v 1.4 1997/07/28 03:40:09 smp Exp smp $
+ *	$Id: mpapic.h,v 1.10 1997/07/28 03:59:34 fsmp Exp $
  */
 
 #ifndef _MACHINE_MPAPIC_H_
 #define _MACHINE_MPAPIC_H_
 
+#include <machine/apic.h>
+
 #include <i386/isa/icu.h>
-#include <i386/include/apic.h>
 
 /* number of busses */
 #if !defined(NBUS)

sys/i386/isa/sound/dmabuf.c

@@ -28,7 +28,8 @@
  */
 
 #include <i386/isa/sound/sound_config.h>
-#include <i386/include/md_var.h>
+
+#include <machine/md_var.h>
 
 #if defined(CONFIG_AUDIO) || defined(CONFIG_GUS)
 #ifdef ALLOW_POLL