diff --git a/include/lber_types.h.nt b/include/lber_types.nt
similarity index 100%
rename from include/lber_types.h.nt
rename to include/lber_types.nt
diff --git a/include/ldap_config.h.nt b/include/ldap_config.nt
similarity index 100%
rename from include/ldap_config.h.nt
rename to include/ldap_config.nt
diff --git a/include/ldap_features.h.nt b/include/ldap_features.nt
similarity index 100%
rename from include/ldap_features.h.nt
rename to include/ldap_features.nt
diff --git a/include/portable.h.nt b/include/portable.nt
similarity index 100%
rename from include/portable.h.nt
rename to include/portable.nt
diff --git a/include/setup.dsp b/include/setup.dsp
index 144fdf68651a9d0cb71f700862a7d97fd55fc5e1..2114f7205e36a637fcdc69acfe3f16561d329819 100644
--- a/include/setup.dsp
+++ b/include/setup.dsp
@@ -78,19 +78,19 @@ CFG=setup - Win32 Debug
 
 # Begin Source File
 
-SOURCE=.\lber_types.h.nt
+SOURCE=.\lber_types.nt
 # End Source File
 # Begin Source File
 
-SOURCE=.\ldap_config.h.nt
+SOURCE=.\ldap_config.nt
 # End Source File
 # Begin Source File
 
-SOURCE=.\ldap_features.h.nt
+SOURCE=.\ldap_features.nt
 # End Source File
 # Begin Source File
 
-SOURCE=.\portable.h.nt
+SOURCE=.\portable.nt
 # End Source File
 # Begin Source File
 
diff --git a/include/setup.mak b/include/setup.mak
index ad8ddaa022226c787ddf1fccfffdc1a11f43bdbe..13f25b36ea8a1826d8949b4dfb4c73a885d82a9b 100644
--- a/include/setup.mak
+++ b/include/setup.mak
@@ -3,19 +3,17 @@
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 #
 
-all: setup.txt
-
-setup.txt: lber_types.h ldap_config.h ldap_features.h portable.h
-        copy setup.mak setup.txt
+.SUFFIXES: .nt
 
-lber_types.h: lber_types.h.nt
-	copy lber_types.h.nt lber_types.h
+.nt.h:
+	copy $*.nt $*.h
 
-ldap_config.h: ldap_config.h.nt
-	copy ldap_config.h.nt ldap_config.h
+all: setup.txt
 
-ldap_features.h: ldap_features.h.nt
-	copy ldap_features.h.nt ldap_features.h
+setup.txt: lber_types.h ldap_config.h ldap_features.h portable.h setup.mak
+	copy setup.mak setup.txt
 
-portable.h: portable.h.nt
-	copy portable.h.nt portable.h
+lber_types.h: lber_types.nt
+ldap_config.h: ldap_config.nt
+ldap_features.h: ldap_features.nt
+portable.h: portable.nt