diff --git a/Draw.c b/Draw.c
index 816ffa7..c4661b1 100644
--- a/Draw.c
+++ b/Draw.c
@@ -15,9 +15,6 @@
 *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-//#include "3dfx.h"
-//#include "cvgregs.h"
-//#include "cvgdefs.h"
 #include "cvg.h"
 #include "glide.h"
 #include "sst1init.h"
diff --git a/Test_Address.c b/Test_Address.c
index d587add..004d66a 100644
--- a/Test_Address.c
+++ b/Test_Address.c
@@ -16,10 +16,9 @@
 */
 
 #include "cvg.h" 
-#include "fxpci.h"
-#include "sst1init.h"
-#include <3dfx.h>
 #include <glide.h>
+#include "sst1init.h"
+#include "fxpci.h"
 
 #include "FaultSources.h"
 #include "Utils.h"
diff --git a/Test_Data.c b/Test_Data.c
index 01a0989..e4ef03e 100644
--- a/Test_Data.c
+++ b/Test_Data.c
@@ -16,10 +16,9 @@
 */
 
 #include "cvg.h" 
-#include "fxpci.h"
-#include "sst1init.h"
-#include <3dfx.h>
 #include <glide.h>
+#include "sst1init.h"
+#include "fxpci.h"
 
 #include "FaultSources.h"
 #include "Utils.h"
@@ -51,9 +50,9 @@ RenderTest(	sst1DeviceInfoStruct* devInfo,
 	ISET(texAddr[2], value1 + 2);	ISET(texAddr[3], value1 + 3);
 	
 	/* writing to second texture line, to use RAM bits 32..63 */
-	texAddr2 += (1<<(9-2))
-	ISET(texAddr2[0], value2);		ISET(texAddr2[1], value2 + 1);
-	ISET(texAddr2[2], value2 + 2);	ISET(texAddr2[3], value2 + 3);
+	texAddr += (1<<(9-2))
+	ISET(texAddr[0], value2);		ISET(texAddr[1], value2 + 1);
+	ISET(texAddr[2], value2 + 2);	ISET(texAddr[3], value2 + 3);
 	
 	/* draw a 8x8triangle */
 	drawTriangle(sstregs,0,0,8);
diff --git a/Test_Data_Huge.c b/Test_Data_Huge.c
index 2fdd425..cc68807 100644
--- a/Test_Data_Huge.c
+++ b/Test_Data_Huge.c
@@ -21,10 +21,9 @@
 #include <unistd.h> 
 
 #include "cvg.h" 
-#include "fxpci.h"
-#include "sst1init.h"
-#include <3dfx.h>
 #include <glide.h>
+#include "sst1init.h"
+#include "fxpci.h"
 
 #include "FaultSources.h"
 #include "Utils.h"
diff --git a/main.c b/main.c
index 94f070e..359cb64 100644
--- a/main.c
+++ b/main.c
@@ -23,10 +23,9 @@
 #include <time.h>
 
 #include "cvg.h" 
-#include "fxpci.h"
-#include "sst1init.h"
-#include <3dfx.h>
 #include <glide.h>
+#include "sst1init.h"
+#include "fxpci.h"
 
 #include "V2MemTest.h"
 #include "FaultSources.h"