diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/Makefile b/Makefile
index 8b71279..f63c14d 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,9 @@ OBJ_DIR = $(BUILD_DIR)/objs
 CC = gcc
 AR = ar
 CFLAGS = -O2 -s -std=gnu99 -pedantic -Wall -D_GNU_SOURCE
-# Not required for glibc >= 2.17, but older glibcs are still common.
+# Not required for glibc >= 2.17.
 # The CMake build script will perform detection, but this Makefile is simple.
-LINK_LIBS = -lrt
+#LINK_LIBS = -lrt
 
 all: makedir ifchd-parse.o cfg.o ndhc
 
@@ -23,7 +23,7 @@ clean:
 	rm -Rf $(BUILD_DIR)
 
 makedir:
-	mkdir -p $(BUILD_DIR) $(OBJ_DIR)/src
+	mkdir -p $(BUILD_DIR) $(OBJ_DIR)/src $(OBJ_DIR)/src/lib
 
 ifchd-parse.o:
 	ragel -G2 -o $(BUILD_DIR)/ifchd-parse.c src/ifchd-parse.rl
@@ -34,10 +34,10 @@ cfg.o:
 	$(CC) $(CFLAGS) $(NDHC_INC) -c -o $(OBJ_DIR)/src/$@ $(BUILD_DIR)/cfg.c
 
 %.o: %.c
-	$(CC) $(CFLAGS) -c -o $(OBJ_DIR)/$@ $<
+	$(CC) $(CFLAGS) $(NDHC_INC) -c -o $(OBJ_DIR)/$@ $<
 
 ndhc: $(NCM_OBJS) $(NDHC_OBJS) ifchd-parse.o cfg.o
-	$(CC) $(CFLAGS) -o $(BUILD_DIR)/$@ $(subst src/,$(OBJ_DIR)/src/,$(NDHC_OBJS)) $(BUILD_DIR)/objs/src/ifchd-parse.o $(BUILD_DIR)/objs/src/cfg.o $(LINK_LIBS)
+	$(CC) $(CFLAGS) -o $(BUILD_DIR)/$@ $(subst src/,$(OBJ_DIR)/src/,$(NDHC_OBJS)) $(subst src/lib/,$(OBJ_DIR)/src/lib/,$(NCM_OBJS)) $(BUILD_DIR)/objs/src/ifchd-parse.o $(BUILD_DIR)/objs/src/cfg.o $(LINK_LIBS)
 
 .PHONY: all clean