diff --git a/Instance/Shared/headers.make b/Instance/Shared/headers.make
index 83f979c6..d0c165e7 100644
--- a/Instance/Shared/headers.make
+++ b/Instance/Shared/headers.make
@@ -28,12 +28,8 @@
 #  defaults to `.' if no set.
 #
 #  $(GNUSTEP_INSTANCE)_HEADER_FILES_INSTALL_DIR : the dir in which to install
-#  the .h files; defaults to $(GNUSTEP_INSTANCE) if not set.
-#
-#  $(GNUSTEP_INSTANCE)_EMPTY_HEADER_FILES_INSTALL_DIR : if this is set to YES
-#  then an empty $(GNUSTEP_INSTANCE)_HEADER_FILES_INSTALL_DIR is tollerated 
-#  and the $(GNUSTEP_INSTANCE) default not used.  This is an exceptional 
-#  behaviour and you don't want it unless you really know what you're doing.
+#  the .h files; defaults to $(GNUSTEP_INSTANCE) if not set.  Please set it 
+#  to `.' if you want it to be like empty.
 #
 
 #
@@ -70,11 +66,10 @@ endif
 
 override HEADER_FILES_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_HEADER_FILES_INSTALL_DIR)
 
+# Please use `.' to force it to stay empty
 ifeq ($(HEADER_FILES_INSTALL_DIR),)
-ifneq ($($(GNUSTEP_INSTANCE)_EMPTY_HEADER_FILES_INSTALL_DIR),YES)
 override HEADER_FILES_INSTALL_DIR = $(GNUSTEP_INSTANCE)
 endif
-endif
 
 shared-instance-headers-install: $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR)
 	for file in $(HEADER_FILES) __done; do \