diff --git a/ChangeLog b/ChangeLog
index fd2de07b6..bcce6e1d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-24  Bradley Bell  <btb@icculus.org>
+
+	* main/inferno.c: redeclare main() 'the SDL way', make sure SDL.h
+	is always included.
+
 2003-04-24  Ingo van Lil  <inguin@gmx.de>
 
 	* main/render.c: fix misspellings of NDEBUG
diff --git a/main/inferno.c b/main/inferno.c
index a51a0ef40..119626838 100644
--- a/main/inferno.c
+++ b/main/inferno.c
@@ -1,4 +1,4 @@
-/* $Id: inferno.c,v 1.60 2003-04-07 23:29:28 btb Exp $ */
+/* $Id: inferno.c,v 1.61 2003-04-24 18:19:05 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -801,7 +801,7 @@ extern int Current_display_mode;        //$$ there's got to be a better way than
 #include "ui.h"
 #endif
 
-#ifdef SDL_INPUT
+#ifndef __MSDOS__
 #include <SDL.h>
 #endif
 
@@ -1173,7 +1173,7 @@ int	Auto_exit = 0;
 char	Auto_file[128] = "";
 #endif
 
-int main(int argc,char **argv)
+int main(int argc, char *argv[])
 {
 	int i, t;
 	ubyte title_pal[768];