diff --git a/include/mathlib.h b/include/mathlib.h
index aa37621..ade6599 100644
--- a/include/mathlib.h
+++ b/include/mathlib.h
@@ -32,7 +32,7 @@
 #include "qtypes.h"
 
 #ifndef M_PI
-#define M_PI            3.14159265358979323846  // matches value in gcc v2 math.h
+#define M_PI	    3.14159265358979323846  // matches value in gcc v2 math.h
 #endif
 
 struct mplane_s;
@@ -64,7 +64,7 @@ void _VectorCopy (vec3_t in, vec3_t out);
 int VectorCompare (vec3_t v1, vec3_t v2);
 vec_t Length (vec3_t v);
 void CrossProduct (vec3_t v1, vec3_t v2, vec3_t cross);
-float VectorNormalize (vec3_t v);               // returns vector length
+float VectorNormalize (vec3_t v);	       // returns vector length
 void VectorInverse (vec3_t v);
 void VectorScale (vec3_t in, vec_t scale, vec3_t out);
 int Q_log2(int val);
@@ -73,7 +73,7 @@ void R_ConcatRotations (float in1[3][3], float in2[3][3], float out[3][3]);
 void R_ConcatTransforms (float in1[3][4], float in2[3][4], float out[3][4]);
 
 void FloorDivMod (double numer, double denom, int *quotient,
-                int *rem);
+		int *rem);
 fixed16_t Invert24To16(fixed16_t val);
 fixed16_t Mul16_30(fixed16_t multiplier, fixed16_t multiplicand);
 int GreatestCommonDivisor (int i1, int i2);
@@ -85,6 +85,23 @@ float   anglemod(float a);
 void RotatePointAroundVector( vec3_t dst, const vec3_t dir, const vec3_t point, float degrees );
 
 
+<<<<<<< mathlib.h
+#define BOX_ON_PLANE_SIDE(emins, emaxs, p)      \
+	(((p)->type < 3)?					       \
+	(									       \
+		((p)->dist <= (emins)[(p)->type])?      \
+			1							       \
+		:								       \
+		(								       \
+			((p)->dist >= (emaxs)[(p)->type])?\
+				2						       \
+			:							       \
+				3						       \
+		)								       \
+	)									       \
+	:									       \
+		BoxOnPlaneSide( (emins), (emaxs), (p)))
+=======
 #define BOX_ON_PLANE_SIDE(emins, emaxs, p)					\
 	(((p)->type < 3)?										\
 		(													\
@@ -101,5 +118,6 @@ void RotatePointAroundVector( vec3_t dst, const vec3_t dir, const vec3_t point,
 		:													\
 		BoxOnPlaneSide( (emins), (emaxs), (p))				\
 	)
+>>>>>>> 1.7
 
 #endif // _MATHLIB_H
diff --git a/include/menu.h b/include/menu.h
index 920fbfa..3aad2c4 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -1,29 +1,29 @@
 /*
-        menu.h
+	menu.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _MENU_H
diff --git a/include/model.h b/include/model.h
index 7afa641..4e50361 100644
--- a/include/model.h
+++ b/include/model.h
@@ -1,29 +1,29 @@
 /*
-        model.h
+	model.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _MODEL_H
diff --git a/include/modelgen.h b/include/modelgen.h
index 26cfad4..c28f78e 100644
--- a/include/modelgen.h
+++ b/include/modelgen.h
@@ -1,29 +1,29 @@
 /*
-        modelgen.h
+	modelgen.h
 
-        header file for model generation program
+	header file for model generation program
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 // *********************************************************
diff --git a/include/msg.h b/include/msg.h
index 040ac00..0f06c02 100644
--- a/include/msg.h
+++ b/include/msg.h
@@ -1,29 +1,29 @@
 /*
-        msg.h
+	msg.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 #ifndef _MSG_H
 #define _MSG_H
diff --git a/include/net.h b/include/net.h
index 09f3a0e..c567cb8 100644
--- a/include/net.h
+++ b/include/net.h
@@ -1,29 +1,29 @@
 /*
-        net.h
+	net.h
 
-        quake's interface to the networking layer
+	quake's interface to the networking layer
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _NET_H
diff --git a/include/pmove.h b/include/pmove.h
index 8b82c66..dd25635 100644
--- a/include/pmove.h
+++ b/include/pmove.h
@@ -1,29 +1,29 @@
 /*
-        pmove.h
+	pmove.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _PMOVE_H
diff --git a/include/pr_comp.h b/include/pr_comp.h
index c5faa53..7bb5100 100644
--- a/include/pr_comp.h
+++ b/include/pr_comp.h
@@ -1,29 +1,29 @@
 /*
-        pr_comp.h
+	pr_comp.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 // this file is shared by quake and qcc
diff --git a/include/progdefs.h b/include/progdefs.h
index 1daea9d..031416f 100644
--- a/include/progdefs.h
+++ b/include/progdefs.h
@@ -1,29 +1,29 @@
 /*
-        progdefs.h
+	progdefs.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 /* file generated by qcc, do not modify */
diff --git a/include/progs.h b/include/progs.h
index 460f639..d4c2311 100644
--- a/include/progs.h
+++ b/include/progs.h
@@ -1,29 +1,29 @@
 /*
-        progs.h
+	progs.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _PROGS_H
diff --git a/include/protocol.h b/include/protocol.h
index f5d1e57..d29bcc1 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -1,29 +1,29 @@
 /*
-        protocol.h
+	protocol.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 // protocol.h -- communications protocols
 
diff --git a/include/quakeasm.h b/include/quakeasm.h
index 9e71194..31f3749 100644
--- a/include/quakeasm.h
+++ b/include/quakeasm.h
@@ -1,29 +1,29 @@
 /*
-        quakeasm.h
+	quakeasm.h
 
-        general asm header file
+	general asm header file
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _QUAKEASM_H
diff --git a/include/quakedef.h b/include/quakedef.h
index 873b764..7ca8c7c 100644
--- a/include/quakedef.h
+++ b/include/quakedef.h
@@ -1,29 +1,29 @@
 /*
-        quakedef.h
+	quakedef.h
 
-        primary header for client
+	primary header for client
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _QUAKEDEF_H
diff --git a/include/r_local.h b/include/r_local.h
index c75fd18..7b96db2 100644
--- a/include/r_local.h
+++ b/include/r_local.h
@@ -1,29 +1,29 @@
 /*
-        r_local.h
+	r_local.h
 
-        private refresh defs
+	private refresh defs
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _R_LOCAL_H
diff --git a/include/r_shared.h b/include/r_shared.h
index bae1026..7100e80 100644
--- a/include/r_shared.h
+++ b/include/r_shared.h
@@ -1,29 +1,29 @@
 /*
-        r_shared.h
+	r_shared.h
 
-        general refresh-related stuff shared between the refresh and the driver
+	general refresh-related stuff shared between the refresh and the driver
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 // FIXME: clean up and move into d_iface.h
diff --git a/include/render.h b/include/render.h
index f822802..6619c96 100644
--- a/include/render.h
+++ b/include/render.h
@@ -1,29 +1,29 @@
 /*
-        render.h
+	render.h
 
-        public interface to refresh functions
+	public interface to refresh functions
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _RENDER_H
diff --git a/include/resource.h b/include/resource.h
index 6925c85..0a81e8d 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -1,30 +1,30 @@
 /*
-        resource.h
+	resource.h
 
-        Microsoft Developer Studio generated include file. Used by winquake.rc
+	Microsoft Developer Studio generated include file. Used by winquake.rc
 
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 //{{NO_DEPENDENCIES}}
 #define IDS_STRING1                     1
diff --git a/include/sbar.h b/include/sbar.h
index 146d560..8c64164 100644
--- a/include/sbar.h
+++ b/include/sbar.h
@@ -1,29 +1,29 @@
 /*
-        sbar.h
+	sbar.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 // the status bar is only redrawn if something has changed, but if anything
diff --git a/include/screen.h b/include/screen.h
index 6db5b3d..97cbbf2 100644
--- a/include/screen.h
+++ b/include/screen.h
@@ -1,29 +1,29 @@
 /*
-        screen.h
+	screen.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 // screen.h
 
diff --git a/include/server.h b/include/server.h
index 04f37b8..8d54632 100644
--- a/include/server.h
+++ b/include/server.h
@@ -1,29 +1,29 @@
 /*
-        server.h
+	server.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 // server.h
 
diff --git a/include/sizebuf.h b/include/sizebuf.h
index a5b62ba..672ad88 100644
--- a/include/sizebuf.h
+++ b/include/sizebuf.h
@@ -1,29 +1,29 @@
 /*
-        sizebuf.h
+	sizebuf.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 #ifndef _SIZEBUF_H
 #define _SIZEBUF_H
diff --git a/include/sound.h b/include/sound.h
index 6cd5efe..368c558 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -1,29 +1,29 @@
 /*
-        sound.h
+	sound.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 // sound.h -- client sound i/o functions
 
diff --git a/include/spritegn.h b/include/spritegn.h
index 3e7f20b..f604ddd 100644
--- a/include/spritegn.h
+++ b/include/spritegn.h
@@ -1,29 +1,29 @@
 /*
-        sprintgn.h
+	sprintgn.h
 
-        header file for sprite generation program
+	header file for sprite generation program
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 // **********************************************************
 // * This file must be identical in the spritegen directory *
diff --git a/include/sys.h b/include/sys.h
index 43bc4d3..7481672 100644
--- a/include/sys.h
+++ b/include/sys.h
@@ -1,29 +1,29 @@
 /*
-        sys.h
+	sys.h
 
-        non-portable functions
+	non-portable functions
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _SYS_H
diff --git a/include/vid.h b/include/vid.h
index ef856f9..66bac9b 100644
--- a/include/vid.h
+++ b/include/vid.h
@@ -1,29 +1,29 @@
 /*
-        vid.h
+	vid.h
 
-        video driver defs
+	video driver defs
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _VID_H
diff --git a/include/view.h b/include/view.h
index 9aba259..83c4090 100644
--- a/include/view.h
+++ b/include/view.h
@@ -1,29 +1,29 @@
 /*
-        view.h
+	view.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 // view.h
 
diff --git a/include/wad.h b/include/wad.h
index e0eb357..d166e40 100644
--- a/include/wad.h
+++ b/include/wad.h
@@ -1,29 +1,29 @@
 /*
-        wad.h
+	wad.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 // wad.h
 
diff --git a/include/winquake.h b/include/winquake.h
index 24242e2..b93ab4a 100644
--- a/include/winquake.h
+++ b/include/winquake.h
@@ -1,29 +1,29 @@
 /*
-        winquake.h
+	winquake.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 
 #ifndef _WINQUAKE_H
diff --git a/include/world.h b/include/world.h
index efc36c7..4f0be41 100644
--- a/include/world.h
+++ b/include/world.h
@@ -1,29 +1,29 @@
 /*
-        world.h
+	world.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 // world.h
 
diff --git a/include/zone.h b/include/zone.h
index f009d72..65a53e6 100644
--- a/include/zone.h
+++ b/include/zone.h
@@ -1,29 +1,29 @@
 /*
-        zone.h
+	zone.h
 
-        (description)
+	(description)
 
-        Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1996-1997  Id Software, Inc.
 
-        This program is free software; you can redistribute it and/or
-        modify it under the terms of the GNU General Public License
-        as published by the Free Software Foundation; either version 2
-        of the License, or (at your option) any later version.
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-        See the GNU General Public License for more details.
+	See the GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to:
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
 
-                Free Software Foundation, Inc.
-                59 Temple Place - Suite 330
-                Boston, MA  02111-1307, USA
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
 
-        $Id$
+	$Id$
 */
 #ifndef _ZONE_H
 #define _ZONE_H