diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c
index a569d0c5793..42a0777d4e4 100644
--- a/sys/amd64/amd64/initcpu.c
+++ b/sys/amd64/amd64/initcpu.c
@@ -26,10 +26,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *		$Id: initcpu.c,v 1.10 1997/11/21 22:33:52 jlemon Exp $
+ *		$Id: initcpu.c,v 1.11 1998/01/03 05:35:51 kato Exp $
  */
 
 #include "opt_cpu.h"
+#include "opt_failsafe.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/conf/options b/sys/conf/options
index 3092f0f9ce3..38e6d34abc0 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.52 1998/01/31 05:00:11 eivind Exp $
+#	$Id: options,v 1.53 1998/01/31 07:23:03 eivind Exp $
 
 # Format:
 # Option name	filename
@@ -12,6 +12,7 @@ DDB_UNATTENDED	opt_ddb.h
 GDB_REMOTE_CHAT	opt_ddb.h
 DEVFS
 DEVFS_ROOT	opt_devfs.h
+FAILSAFE
 KTRACE
 MD5
 MFS_AUTOLOAD	opt_mfs.h
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index a569d0c5793..42a0777d4e4 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -26,10 +26,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *		$Id: initcpu.c,v 1.10 1997/11/21 22:33:52 jlemon Exp $
+ *		$Id: initcpu.c,v 1.11 1998/01/03 05:35:51 kato Exp $
  */
 
 #include "opt_cpu.h"
+#include "opt_failsafe.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 749ce0eddc9..55bd801acf7 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.112 1997/11/07 09:20:56 phk Exp $
+**  $Id: ncr.c,v 1.113 1997/12/02 22:37:58 se Exp $
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
@@ -52,6 +52,7 @@
 #define NCR_GETCC_WITHMSG
 
 #if defined (__FreeBSD__) && defined(KERNEL)
+#include "opt_failsafe.h"
 #include "opt_ncr.h"
 #endif /* defined (__FreeBSD__) && defined(KERNEL) */
 
@@ -1341,7 +1342,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 
 static char ident[] =
-	"\n$Id: ncr.c,v 1.112 1997/11/07 09:20:56 phk Exp $\n";
+	"\n$Id: ncr.c,v 1.113 1997/12/02 22:37:58 se Exp $\n";
 
 static const u_long	ncr_version = NCR_VERSION	* 11
 	+ (u_long) sizeof (struct ncb)	*  7