diff --git a/src/main.c b/src/main.c
index 0d91aca..91f64e5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -73,7 +73,7 @@ static int WantCDRom = 1;
 static int WantJoystick = 1;
 
 /* originally was "/usr/lib/libGL.so.1:/usr/lib/tls/libGL.so.1:/usr/X11R6/lib/libGL.so" */
-static const char * opengl_library = "libGL.so.1";
+static const char * opengl_library = NULL;
 
 /* ** */
 
@@ -432,11 +432,16 @@ static void load_opengl_library(const char *lib)
 	size_t len, copylen;
 	
 	if (lib == NULL) {
-		fprintf(stderr, "ERROR: no opengl libraries given\n");
-		exit(EXIT_FAILURE);
+		if (SDL_GL_LoadLibrary(NULL) == 0) {
+			/* success */
+			return;
+		}
+		
+		fprintf( stderr, "ERROR: no opengl libraries given\n" );
+		exit( EXIT_FAILURE );
 	}
 	
-	while (*lib) {
+	while (lib != NULL && *lib) {
 		len = strcspn(lib, ":");
 				
 		copylen = min(len, PATH_MAX-1);
@@ -448,7 +453,7 @@ static void load_opengl_library(const char *lib)
 			/* success */
 			return;
 		}
-			
+		
 		lib += len;
 		lib += strspn(lib, ":");
 	}
diff --git a/src/mathline.c b/src/mathline.c
index d01596a..8177ccd 100644
--- a/src/mathline.c
+++ b/src/mathline.c
@@ -574,7 +574,7 @@ typedef struct matrixch {
 
 */
 
-extern volatile int sqrt_temp;
+volatile int sqrt_temp;
 
 int SqRoot32(int A)
 {
@@ -589,6 +589,7 @@ int SqRoot32(int A)
 	}
 */
 
+#if 0
 __asm__ volatile
 	("finit				\n\t"
 	"fildl	%0			\n\t"
@@ -601,6 +602,9 @@ __asm__ volatile
 	);
 	
 	return sqrt_temp;
+#else
+	return sqrt( (float)A );
+#endif
 }
 
 /*
@@ -610,12 +614,12 @@ __asm__ volatile
 
 */
 
-extern volatile float fti_fptmp;
-extern volatile int fti_itmp;
+volatile float fti_fptmp;
+volatile int fti_itmp;
 
 void FloatToInt()
 {
-#if 1
+#if 0
 __asm__ volatile
 	("flds	fti_fptmp		\n\t"
 	"fistpl	fti_itmp		\n\t"
diff --git a/src/win95/plspecfn.c b/src/win95/plspecfn.c
index a712e04..c3d033d 100644
--- a/src/win95/plspecfn.c
+++ b/src/win95/plspecfn.c
@@ -17,11 +17,6 @@
 #include "kshape.h"
 #endif
 
-/* globals from inline.h */
-int sqrt_temp;
-float fti_fptmp;
-int fti_itmp;
-
 /*
 
  Platform Specific Functions