diff --git a/src/docs/cmu-user/cmu-user.tex b/src/docs/cmu-user/cmu-user.tex
index 4a94c162345d4bf7a3f2309a6e5c5dc5f02da9a6..55e8cde065822fe41e4212d95afff1ca28928a7b 100644
--- a/src/docs/cmu-user/cmu-user.tex
+++ b/src/docs/cmu-user/cmu-user.tex
@@ -32,6 +32,7 @@
 \usepackage{xspace}
 \usepackage{alltt}
 \usepackage{index}
+\usepackage{ifpdf}
 \usepackage{ifthen}
 \usepackage{calc}
 \usepackage{sectsty}
diff --git a/src/docs/cmu-user/introduction.tex b/src/docs/cmu-user/introduction.tex
index dbce9ba1abaae10625812500da21742f24c9a616..2075509cb90549a8368f1524c998aa05bd1125b0 100644
--- a/src/docs/cmu-user/introduction.tex
+++ b/src/docs/cmu-user/introduction.tex
@@ -47,7 +47,7 @@ about \cmucl. Users will also need a separate manual describing the
 \href{http://www.lispworks.com/documentation/HyperSpec/Front/index.htm}
 {Hyperspec}.
 \else
-\emph{Hyperspec} at \href{http://www.lispworks.com/documentation/HyperSpec/Front/index.htm}
+\emph{Hyperspec} at \url{http://www.lispworks.com/documentation/HyperSpec/Front/index.htm}
 \fi
 
 
diff --git a/src/docs/cmu-user/macros.tex b/src/docs/cmu-user/macros.tex
index 9c8cba51f3526c38b53a2c0806914dd403fe3fd0..bfb1669cf67680f88bb3aa523776e11b2d8a5df5 100644
--- a/src/docs/cmu-user/macros.tex
+++ b/src/docs/cmu-user/macros.tex
@@ -4,18 +4,6 @@
 %
 % by Raymond Toy
 
-
-% define a new conditional statement which allows us to include
-% stuff conditionally when compiling to PDF. 
-\newif\ifpdf
-\ifx\pdfoutput\undefined
-   \pdffalse
-\else
-   \pdfoutput=1
-   \pdftrue
-\fi
-
-
 % use Palatino
 \renewcommand{\rmdefault}{ppl}
 \ifpdf
diff --git a/src/docs/cmu-user/unicode.tex b/src/docs/cmu-user/unicode.tex
index c6a1a98a7620fcb288f1d77db9f30e1847e1d879..cab4c599bee27737d132023a13849ca9507b41e1 100644
--- a/src/docs/cmu-user/unicode.tex
+++ b/src/docs/cmu-user/unicode.tex
@@ -11,7 +11,7 @@ To understand the support for Unicode, we refer the reader to the
 \ifpdf
 \href{http://www.unicode.org/}{Unicode standard}.
 \else
-\emph{Unicode standard} at \href{http://www.unicode.org}
+\emph{Unicode standard} at \url{http://www.unicode.org}
 \fi
 \section{Changes}
 
diff --git a/src/docs/internals/design.tex b/src/docs/internals/design.tex
index 753ed61f3be04d186db85e5c6df4d92393a17282..776ee1e9947944483150480553e00a219f03b022 100644
--- a/src/docs/internals/design.tex
+++ b/src/docs/internals/design.tex
@@ -2,23 +2,12 @@
 %\documentstyle{report} % -*- Dictionary: design -*-
 
 \documentclass{report}
+\usepackage{ifpdf}
 \usepackage{ifthen}
 \usepackage{calc}
 \usepackage{palatino}
 \usepackage[hyperindex=false,colorlinks=false,urlcolor=blue]{hyperref}
 
-% define a new conditional statement which allows us to include
-% stuff conditionally when compiling to PDF. 
-\newif\ifpdf
-\ifx\pdfoutput\undefined
-   \pdffalse
-\else
-   \pdfoutput=1
-   \pdftrue
-\fi
-
-
-
 \title{Design of CMU Common Lisp}
 \date{January 15, 2003}
 \author{Robert A. MacLachlan (ed)}