diff --git a/src/glw.h b/src/glw.h
new file mode 100644
index 0000000..05a351b
--- /dev/null
+++ b/src/glw.h
@@ -0,0 +1,46 @@
+/* $Id$
+ *
+ * used to be glw_linux.h
+ * 
+ * Copyright (C) 1997-2001 Id Software, Inc.
+ * Copyright (c) 2002 The Quakeforge Project.
+ *
+ * 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.  
+ * 
+ * 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 the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/* os code merge, i like my way better -- jaq
+#ifndef __linux__
+#error You shouldnt be including this file on non-Linux platforms
+#endif
+*/
+
+#ifndef __GLW_H__
+#define __GLW_H__
+
+#ifdef __linux__
+
+typedef struct
+{
+	void *OpenGLLib; // instance of OpenGL library
+
+	FILE *log_fp;
+} glwstate_t;
+
+extern glwstate_t glw_state;
+
+#endif /* __linux__ */
+
+#endif /* __GLW_H__ */
diff --git a/src/glw_linux.h b/src/glw_linux.h
deleted file mode 100644
index cd04b0e..0000000
--- a/src/glw_linux.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright (C) 1997-2001 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 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.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-#ifndef __linux__
-#error You shouldnt be including this file on non-Linux platforms
-#endif
-
-#ifndef __GLW_LINUX_H__
-#define __GLW_LINUX_H__
-
-typedef struct
-{
-	void *OpenGLLib; // instance of OpenGL library
-
-	FILE *log_fp;
-} glwstate_t;
-
-extern glwstate_t glw_state;
-
-#endif