From 38886de0c3e9ea5729ef23e4c653fa2822f52e8f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 6 Apr 2021 14:43:39 +0200
Subject: xscreensaver 6.00

---
 hacks/glx/tunnel_draw.c | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

(limited to 'hacks/glx/tunnel_draw.c')

diff --git a/hacks/glx/tunnel_draw.c b/hacks/glx/tunnel_draw.c
index 8a87c76..4e23339 100644
--- a/hacks/glx/tunnel_draw.c
+++ b/hacks/glx/tunnel_draw.c
@@ -34,9 +34,8 @@ static const char sccsid[] = "@(#)tunnel_draw.c	5.13 2004/05/25 xlockmore";
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "screenhackI.h"
+#include "tunnel_draw.h"
 
 #ifdef USE_GL /* whole file */
 
@@ -44,24 +43,6 @@ static const char sccsid[] = "@(#)tunnel_draw.c	5.13 2004/05/25 xlockmore";
 #include <stdlib.h>
 #include <math.h>
 
-#ifdef STANDALONE
-# ifndef HAVE_JWXYZ
-#  include <GL/gl.h>
-#  include <GL/glu.h>
-# endif
-#endif
-#ifdef HAVE_ANDROID
-#include <GLES/gl.h>
-#endif
-
-
-#include "tunnel_draw.h"
-
-#ifdef STANDALONE /* For NRAND() */
-#include "xlockmoreI.h"          /* in xscreensaver distribution */
-#else /* STANDALONE */
-#include "xlock.h"              /* in xlockmore distribution */
-#endif /* STANDALONE */
 
 typedef struct 
 {
-- 
cgit v1.2.3-55-g7522