--- gwyddion.orig/app/makefile.msc.gwt	2006-09-10 20:30:02.000000000 +0200
+++ gwyddion/app/makefile.msc.gwt	2006-10-02 08:25:36.000000000 +0200
@@ -63,9 +63,9 @@ prg: $(PROGRAM).exe
 
 # Install install every .h file
 install: install-lib install-prg
-	del "$(DEST_DIR)\include\$(XLIBRARY)\authors.h"
-	del "$(DEST_DIR)\include\$(XLIBRARY)\gwyddion.h"
-	del "$(DEST_DIR)\include\$(XLIBRARY)\gwyappinternal.h"
+	del "$(DEST_DIR)\include\$(LIBDIR)\authors.h"
+	del "$(DEST_DIR)\include\$(LIBDIR)\gwyddion.h"
+	del "$(DEST_DIR)\include\$(LIBDIR)\gwyappinternal.h"
 
 !INCLUDE $(TOP_SRCDIR)\rules.msc
 
--- gwyddion.orig/app/makefile.msc	2006-10-02 08:26:32.000000000 +0200
+++ gwyddion/app/makefile.msc	2006-10-02 08:26:32.000000000 +0200
@@ -103,9 +103,9 @@ prg: $(PROGRAM).exe
 
 # Install install every .h file
 install: install-lib install-prg
-	del "$(DEST_DIR)\include\$(XLIBRARY)\authors.h"
-	del "$(DEST_DIR)\include\$(XLIBRARY)\gwyddion.h"
-	del "$(DEST_DIR)\include\$(XLIBRARY)\gwyappinternal.h"
+	del "$(DEST_DIR)\include\$(LIBDIR)\authors.h"
+	del "$(DEST_DIR)\include\$(LIBDIR)\gwyddion.h"
+	del "$(DEST_DIR)\include\$(LIBDIR)\gwyappinternal.h"
 
 !INCLUDE $(TOP_SRCDIR)\rules.msc
 
--- gwyddion.orig/libgwymodule/makefile.msc.gwt	2006-09-10 20:30:02.000000000 +0200
+++ gwyddion/libgwymodule/makefile.msc.gwt	2006-10-02 08:25:56.000000000 +0200
@@ -34,7 +34,7 @@ lib: $(LIBRARY)-$(LIB_VER).dll
 
 # Install install every .h file
 install: install-lib
-	del "$(DEST_DIR)\include\$(XLIBRARY)\gwymoduleinternal.h"
+	del "$(DEST_DIR)\include\$(LIBDIR)\gwymoduleinternal.h"
 
 !INCLUDE $(TOP_SRCDIR)\rules.msc
 
--- gwyddion.orig/libgwymodule/makefile.msc	2006-10-02 08:26:32.000000000 +0200
+++ gwyddion/libgwymodule/makefile.msc	2006-10-02 08:26:32.000000000 +0200
@@ -52,7 +52,7 @@ lib: $(LIBRARY)-$(LIB_VER).dll
 
 # Install install every .h file
 install: install-lib
-	del "$(DEST_DIR)\include\$(XLIBRARY)\gwymoduleinternal.h"
+	del "$(DEST_DIR)\include\$(LIBDIR)\gwymoduleinternal.h"
 
 !INCLUDE $(TOP_SRCDIR)\rules.msc
 
--- gwyddion.orig/modules/tools/makefile.msc.gwt	2006-10-02 08:41:43.000000000 +0200
+++ gwyddion/modules/tools/makefile.msc.gwt	2006-10-02 08:38:59.000000000 +0200
@@ -1,7 +1,7 @@
 # @(#) $Id: makefile.msc.gwt,v 1.5 2006/09/10 20:48:14 yeti-dn Exp $
 
 <[[:SELF:]]>
-MOD_TYPE = tools
+MOD_TYPE = tool
 <[[:MODULES:]]>
 
 !INCLUDE $(TOP_SRCDIR)\make.msc
--- gwyddion.orig/modules/tools/makefile.msc	2006-10-02 08:39:40.000000000 +0200
+++ gwyddion/modules/tools/makefile.msc	2006-10-02 08:39:40.000000000 +0200
@@ -1,7 +1,7 @@
 # This file was GENERATED from makefile.msc.gwt by utils/update-msvc.py.
 
 TOP_SRCDIR = ..\..
-MOD_TYPE = tools
+MOD_TYPE = tool
 MODULES = \
 	crop.dll \
 	distance.dll \