diff --git a/ghidra/headerconvert.awk b/ghidra/headerconvert.awk
index c8383aa..e1bba51 100644
--- a/ghidra/headerconvert.awk
+++ b/ghidra/headerconvert.awk
@@ -5,7 +5,7 @@
 function fn_ptr(cls, signature,     ret, fname, args) {
 # Convert the given method signature to a function pointer
 	if ($1 ~ /^~/) # Special case for virtual destructor
-		return "\t\t" cls " * __attribute__((thiscall)) "\
+		return "\t\t void * __attribute__((thiscall)) "\
 			"(*scalar_deleting_destructor)("\
 				cls " *, "\
 				"BOOL"\
diff --git a/ghidra/make_header.sh b/ghidra/make_header.sh
index b99ae22..6b772df 100755
--- a/ghidra/make_header.sh
+++ b/ghidra/make_header.sh
@@ -9,8 +9,8 @@ printf '%s\n' '// Automatically generated mass header file for Ghidra' > jsrf.h
 # all the headers here by hand in an order that functions properly
 HEADERS="
 	Std.hpp
-	XDK/Win32.hpp
-	XDK/D3D.hpp
+	XDK/Win32.h
+	XDK/D3D.h
 	Smilebit/MMatrix.hpp
 	JSRF/Core.hpp
 	JSRF/GameData.hpp