diff --git a/cfg.mk b/cfg.mk
index e77fe89e..35f2595d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -76,6 +76,8 @@ $(call exclude,								\
   prohibit_always-defined_macros+=?|^lib/timevar.c$$			\
   prohibit_always-defined_macros+=?|^src/(parse-gram.c|system.h)$$	\
   prohibit_always-defined_macros+=?|^tests/regression.at$$		\
+  prohibit_always_true_header_tests=^djgpp/subpipe.h$$|^lib/timevar.c$$	\
+  prohibit_always_true_header_tests+=?|^m4/timevar.m4$$			\
   prohibit_defined_have_decl_tests=?|^lib/timevar.c$$			\
   prohibit_doubled_word=^tests/named-refs.at$$                          \
   prohibit_magic_number_exit=^doc/bison.texi$$				\
diff --git a/doc/local.mk b/doc/local.mk
index c8b72ac5..cac9f544 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -124,11 +124,11 @@ nodist_man_MANS = doc/yacc.1
 ## ----------------------------- ##
 
 CLEANDIRS += doc/figs
-FIGS_DOT = 							\
-  doc/figs/example.dot						\
+FIGS_DOT =                                                      \
+  doc/figs/example.dot                                          \
   doc/figs/example-reduce.dot doc/figs/example-shift.dot
-EXTRA_DIST +=								\
-  $(FIGS_DOT)								\
+EXTRA_DIST +=                                                           \
+  $(FIGS_DOT)                                                           \
   $(FIGS_DOT:.dot=.eps) $(FIGS_DOT:.dot=.pdf) $(FIGS_DOT:.dot=.png)
 SUFFIXES += .dot .eps .pdf .png
 
diff --git a/lib/main.c b/lib/main.c
index 7996c7fb..2cb880eb 100644
--- a/lib/main.c
+++ b/lib/main.c
@@ -18,13 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if ! HAVE_SETLOCALE
-# define setlocale(Category, Locale)
-#endif
+#include <locale.h>
 
 int yyparse (void);
 
diff --git a/tests/calc.at b/tests/calc.at
index 498efa94..984e6b5f 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -46,12 +46,7 @@ m4_define([_AT_DATA_CALC_Y],
 
 m4_pushdef([AT_CALC_MAIN],
 [#include <assert.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#else
-# undef alarm
-# define alarm(seconds) /* empty */
-#endif
+#include <unistd.h>
 
 AT_SKEL_CC_IF([[
 /* A C++ ]AT_NAME_PREFIX[parse that simulates the C signature.  */