diff --git a/Makefile b/Makefile
index 081f93b..b50ea47 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,16 @@
 
 # See LICENSE file for copyright and license details.
 
-include options.mk
 include host.mk
+include options.mk
 include toggle.mk
 
+CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMATOGGLE) $(BDTOGGLE) $(PANGOTOGGLE) $(IMLIB2TOGGLE)
+CFLAGS   = -std=c99 -pedantic -Wall $(OPT) $(INCS) $(CPPFLAGS)
+LDFLAGS  = $(LIBS)
+INCS = -I$(X11INC) -I$(FREETYPEINC) -I$(BDINC) `pkg-config --cflags $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF)`
+LIBS = -L$(X11LIB) $(X11LIBS) $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) -lm `pkg-config --libs $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF)` $(BDLIBS) $(IMLIB2LIBS)
+
 SRC = libs/sl/draw.c spmenu.c libs/sl/main.c
 OBJ = $(SRC:.c=.o)
 
diff --git a/build.sh b/build.sh
index 5a55037..111a0e5 100755
--- a/build.sh
+++ b/build.sh
@@ -89,7 +89,6 @@ build() {
         CC="$CC" \
         PREFIX="$PREFIX" \
         OPT="$OPT" \
-        INCDIR="$INCDIR" \
         XINERAMALIBS="$xineramalib" \
         XINERAMATOGGLE="$xineramatoggle" \
         IMLIB2LIBS="$imlib2libs" \
@@ -111,7 +110,6 @@ install() {
         CC="$CC" \
         PREFIX="$PREFIX" \
         OPT="$OPT" \
-        INCDIR="$INCDIR" \
         XINERAMALIBS="$xineramalib" \
         XINERAMATOGGLE="$xineramatoggle" \
         IMLIB2LIBS="$imlib2libs" \
diff --git a/host.mk b/host.mk
index 0997428..2ba3f41 100644
--- a/host.mk
+++ b/host.mk
@@ -21,7 +21,7 @@ X11LIB       = /usr/X11R6/lib
 
 # freetype
 FREETYPELIBS = -lfontconfig -lXft
-FREETYPEINC  = $(INCDIR)/freetype2
+FREETYPEINC  = ${INCDIR}/freetype2
 
 # xft
 XFTCONF      = xft
@@ -44,9 +44,3 @@ OPENSSLCONF  = openssl
 #FREETYPEINC = $(INCDIR)/freetype2
 #X11INC      = /opt/X11/include
 #X11LIB      = /opt/X11/lib
-
-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMATOGGLE) $(BDTOGGLE) $(PANGOTOGGLE) $(IMLIB2TOGGLE)
-CFLAGS   = -std=c99 -pedantic -Wall $(OPT) $(INCS) $(CPPFLAGS)
-LDFLAGS  = $(LIBS)
-INCS = -I$(X11INC) -I$(FREETYPEINC) -I$(BDINC) `pkg-config --cflags $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF)`
-LIBS = -L$(X11LIB) $(X11LIBS) $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) -lm `pkg-config --libs $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF)` $(BDLIBS) $(IMLIB2LIBS)
diff --git a/spmenu.1 b/spmenu.1
index 5b7e7b6..19fba80 100644
--- a/spmenu.1
+++ b/spmenu.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pandoc 3.1
+.\" Automatically generated by Pandoc 3.0.1
 .\"
 .\" Define V font for inline verbatim, using C font in formats
 .\" that render this, and otherwise B font.