tools/null_state_gen: fix various compiler warnings

Add the debug and warning flags to cflags and fix the resulting issues.

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
diff --git a/tools/null_state_gen/Makefile.am b/tools/null_state_gen/Makefile.am
index bf8cbdb..24884a7 100644
--- a/tools/null_state_gen/Makefile.am
+++ b/tools/null_state_gen/Makefile.am
@@ -1,11 +1,13 @@
 GPU_TOOLS_PATH := $(top_srcdir)
 AM_CPPFLAGS = -I$(top_srcdir)
+AM_CFLAGS = $(DEBUG_CFLAGS) $(CWARNFLAGS)
 
 noinst_PROGRAMS = intel_null_state_gen
 
 intel_null_state_gen_SOURCES = 	\
 	intel_batchbuffer.c \
 	intel_batchbuffer.h \
+	intel_renderstate.h \
 	intel_renderstate_gen6.c \
 	intel_renderstate_gen7.c \
 	intel_renderstate_gen8.c \