diff --git a/second/cli.c b/second/cli.c
index a7c497c..7ac0cbb 100644
--- a/second/cli.c
+++ b/second/cli.c
@@ -4,6 +4,7 @@
  *
  */
 
+#define __NO_INLINE__	/* to avoid inline putchar() */
 #include <stdio.h>
 #include <string.h>
 
diff --git a/second/main.c b/second/main.c
index be185ff..a1082b6 100644
--- a/second/main.c
+++ b/second/main.c
@@ -4,12 +4,16 @@
  *
  */
 
+#define __NO_INLINE__
+
 #include <stdio.h>
 #include <malloc.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "lowmem.h"
+#include <macos/types.h>
+#include <macos/gestalt.h>
+
 #include "bank.h"
 #include "memory.h"
 #if defined(ARCH_M68K)
@@ -24,7 +28,6 @@
 #endif
 #include "arch.h"
 #include "misc.h"
-#include "glue.h"
 #include "load.h"
 #include "console.h"
 #include "vga.h"