--- openvasd/Makefile.orig
+++ openvasd/Makefile
@@ -38,92 +38,92 @@
 all : openvasd
 
 openvasd : $(OBJS)
-	$(CC) $(LDFLAGS) $(OPENVAS_INCLUDE) $(OBJS)  -o openvasd $(LIBS)
+	$(CC) $(LDFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) $(OBJS)  -o openvasd $(LIBS)
 
 users.o : users.c users.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c users.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c users.c 
 
 processes.o : processes.c processes.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c processes.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c processes.c 
 
 rules.o : rules.c rules.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c rules.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c rules.c 
 
 preferences.o : preferences.c preferences.h 
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c preferences.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c preferences.c 
 
 pluginload.o : pluginload.h pluginload.c
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c pluginload.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginload.c 
 
 openvasd.o : openvasd.c 
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c openvasd.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c openvasd.c 
 
 auth.o : auth.c auth.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c auth.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c auth.c 
 
 attack.o : attack.c attack.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c attack.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c attack.c 
 
 comm.o : comm.c comm.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c comm.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c comm.c 
 
 utils.o : utils.c utils.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c utils.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c utils.c 
 
 log.o : log.c log.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c log.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c log.c 
 
 sighand.o : sighand.c sighand.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c sighand.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c sighand.c 
 
 ntp_11.o  : ntp_11.c ntp_11.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c ntp_11.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c ntp_11.c 
 
 otp_1_0.o: otp_1_0.c otp_1_0.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c otp_1_0.c
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c otp_1_0.c
 
 parser.o : parser.c parser.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c parser.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c parser.c 
 
 piic.o : piic.c piic.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c piic.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c piic.c 
 
 nasl_plugins.o : nasl_plugins.c
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c nasl_plugins.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c nasl_plugins.c 
 
 nes_plugins.o : nes_plugins.c
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c nes_plugins.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c nes_plugins.c 
 
 oval_plugins.o : oval_plugins.c
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c oval_plugins.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c oval_plugins.c 
 
 plugs_req.o : plugs_req.c
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c plugs_req.c 
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c plugs_req.c 
 
 save_tests.o : save_tests.c save_tests.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c save_tests.c	
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c save_tests.c	
 
 save_kb.o : save_kb.c save_kb.h
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c save_kb.c
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c save_kb.c
 
 pluginlaunch.o : pluginlaunch.c
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c pluginlaunch.c
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginlaunch.c
 
 locks.o : locks.c 
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c locks.c
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c locks.c
 
 
 plugs_hash.o : plugs_hash.c 
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c plugs_hash.c
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c plugs_hash.c
 
 pluginscheduler.o : pluginscheduler.c
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c pluginscheduler.c
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginscheduler.c
 
 hosts.o : hosts.c
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c hosts.c
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c hosts.c
 
 shared_socket.o : shared_socket.c
-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c shared_socket.c
+	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c shared_socket.c
 clean :
 	rm -f openvasd *.o *~