diff --git a/mach/arm/ncg/Makefile b/mach/arm/ncg/Makefile
index 75e23b0a3..05e2f3742 100644
--- a/mach/arm/ncg/Makefile
+++ b/mach/arm/ncg/Makefile
@@ -10,7 +10,7 @@ PREFLAGS=-I$(EMHOME)/h -I. -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) -O
 LDFLAGS=-i $(PFLAGS)
-LINTOPTS=-hbxac
+LINTOPTS=-bx
 LIBS=$(EMHOME)/lib/em_data.a
 CDIR=$(EMHOME)/mach/proto/ncg
 CGG=$(EMHOME)/lib/ncgg
@@ -72,8 +72,8 @@ tables.c: table $(CGG)
 	$(EMHOME)/lib/cpp $(TABLEFLAGS) table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
-lint: $(CFILES)
-	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
+lint: $(CFILES) tables.c
+	lint $(LINTOPTS) $(PREFLAGS) -I$(CDIR) $(CFILES) tables.c
 clean:
 	rm -f *.o tables.c tables.h debug.out cg tables.H
 
diff --git a/mach/i386/ncg/Makefile b/mach/i386/ncg/Makefile
index 75e23b0a3..05e2f3742 100644
--- a/mach/i386/ncg/Makefile
+++ b/mach/i386/ncg/Makefile
@@ -10,7 +10,7 @@ PREFLAGS=-I$(EMHOME)/h -I. -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) -O
 LDFLAGS=-i $(PFLAGS)
-LINTOPTS=-hbxac
+LINTOPTS=-bx
 LIBS=$(EMHOME)/lib/em_data.a
 CDIR=$(EMHOME)/mach/proto/ncg
 CGG=$(EMHOME)/lib/ncgg
@@ -72,8 +72,8 @@ tables.c: table $(CGG)
 	$(EMHOME)/lib/cpp $(TABLEFLAGS) table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
-lint: $(CFILES)
-	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
+lint: $(CFILES) tables.c
+	lint $(LINTOPTS) $(PREFLAGS) -I$(CDIR) $(CFILES) tables.c
 clean:
 	rm -f *.o tables.c tables.h debug.out cg tables.H
 
diff --git a/mach/i80/ncg/Makefile b/mach/i80/ncg/Makefile
index 75e23b0a3..05e2f3742 100644
--- a/mach/i80/ncg/Makefile
+++ b/mach/i80/ncg/Makefile
@@ -10,7 +10,7 @@ PREFLAGS=-I$(EMHOME)/h -I. -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) -O
 LDFLAGS=-i $(PFLAGS)
-LINTOPTS=-hbxac
+LINTOPTS=-bx
 LIBS=$(EMHOME)/lib/em_data.a
 CDIR=$(EMHOME)/mach/proto/ncg
 CGG=$(EMHOME)/lib/ncgg
@@ -72,8 +72,8 @@ tables.c: table $(CGG)
 	$(EMHOME)/lib/cpp $(TABLEFLAGS) table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
-lint: $(CFILES)
-	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
+lint: $(CFILES) tables.c
+	lint $(LINTOPTS) $(PREFLAGS) -I$(CDIR) $(CFILES) tables.c
 clean:
 	rm -f *.o tables.c tables.h debug.out cg tables.H
 
diff --git a/mach/i86/ncg/Makefile b/mach/i86/ncg/Makefile
index 75e23b0a3..05e2f3742 100644
--- a/mach/i86/ncg/Makefile
+++ b/mach/i86/ncg/Makefile
@@ -10,7 +10,7 @@ PREFLAGS=-I$(EMHOME)/h -I. -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) -O
 LDFLAGS=-i $(PFLAGS)
-LINTOPTS=-hbxac
+LINTOPTS=-bx
 LIBS=$(EMHOME)/lib/em_data.a
 CDIR=$(EMHOME)/mach/proto/ncg
 CGG=$(EMHOME)/lib/ncgg
@@ -72,8 +72,8 @@ tables.c: table $(CGG)
 	$(EMHOME)/lib/cpp $(TABLEFLAGS) table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
-lint: $(CFILES)
-	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
+lint: $(CFILES) tables.c
+	lint $(LINTOPTS) $(PREFLAGS) -I$(CDIR) $(CFILES) tables.c
 clean:
 	rm -f *.o tables.c tables.h debug.out cg tables.H
 
diff --git a/mach/m68020/ncg/Makefile b/mach/m68020/ncg/Makefile
index 75e23b0a3..05e2f3742 100644
--- a/mach/m68020/ncg/Makefile
+++ b/mach/m68020/ncg/Makefile
@@ -10,7 +10,7 @@ PREFLAGS=-I$(EMHOME)/h -I. -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) -O
 LDFLAGS=-i $(PFLAGS)
-LINTOPTS=-hbxac
+LINTOPTS=-bx
 LIBS=$(EMHOME)/lib/em_data.a
 CDIR=$(EMHOME)/mach/proto/ncg
 CGG=$(EMHOME)/lib/ncgg
@@ -72,8 +72,8 @@ tables.c: table $(CGG)
 	$(EMHOME)/lib/cpp $(TABLEFLAGS) table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
-lint: $(CFILES)
-	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
+lint: $(CFILES) tables.c
+	lint $(LINTOPTS) $(PREFLAGS) -I$(CDIR) $(CFILES) tables.c
 clean:
 	rm -f *.o tables.c tables.h debug.out cg tables.H
 
diff --git a/mach/m68k2/ncg/Makefile b/mach/m68k2/ncg/Makefile
index 75e23b0a3..05e2f3742 100644
--- a/mach/m68k2/ncg/Makefile
+++ b/mach/m68k2/ncg/Makefile
@@ -10,7 +10,7 @@ PREFLAGS=-I$(EMHOME)/h -I. -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) -O
 LDFLAGS=-i $(PFLAGS)
-LINTOPTS=-hbxac
+LINTOPTS=-bx
 LIBS=$(EMHOME)/lib/em_data.a
 CDIR=$(EMHOME)/mach/proto/ncg
 CGG=$(EMHOME)/lib/ncgg
@@ -72,8 +72,8 @@ tables.c: table $(CGG)
 	$(EMHOME)/lib/cpp $(TABLEFLAGS) table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
-lint: $(CFILES)
-	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
+lint: $(CFILES) tables.c
+	lint $(LINTOPTS) $(PREFLAGS) -I$(CDIR) $(CFILES) tables.c
 clean:
 	rm -f *.o tables.c tables.h debug.out cg tables.H
 
diff --git a/mach/m68k4/ncg/Makefile b/mach/m68k4/ncg/Makefile
index 75e23b0a3..05e2f3742 100644
--- a/mach/m68k4/ncg/Makefile
+++ b/mach/m68k4/ncg/Makefile
@@ -10,7 +10,7 @@ PREFLAGS=-I$(EMHOME)/h -I. -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) -O
 LDFLAGS=-i $(PFLAGS)
-LINTOPTS=-hbxac
+LINTOPTS=-bx
 LIBS=$(EMHOME)/lib/em_data.a
 CDIR=$(EMHOME)/mach/proto/ncg
 CGG=$(EMHOME)/lib/ncgg
@@ -72,8 +72,8 @@ tables.c: table $(CGG)
 	$(EMHOME)/lib/cpp $(TABLEFLAGS) table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
-lint: $(CFILES)
-	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
+lint: $(CFILES) tables.c
+	lint $(LINTOPTS) $(PREFLAGS) -I$(CDIR) $(CFILES) tables.c
 clean:
 	rm -f *.o tables.c tables.h debug.out cg tables.H
 
diff --git a/mach/moon3/ncg/Makefile b/mach/moon3/ncg/Makefile
index 75e23b0a3..05e2f3742 100644
--- a/mach/moon3/ncg/Makefile
+++ b/mach/moon3/ncg/Makefile
@@ -10,7 +10,7 @@ PREFLAGS=-I$(EMHOME)/h -I. -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) -O
 LDFLAGS=-i $(PFLAGS)
-LINTOPTS=-hbxac
+LINTOPTS=-bx
 LIBS=$(EMHOME)/lib/em_data.a
 CDIR=$(EMHOME)/mach/proto/ncg
 CGG=$(EMHOME)/lib/ncgg
@@ -72,8 +72,8 @@ tables.c: table $(CGG)
 	$(EMHOME)/lib/cpp $(TABLEFLAGS) table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
-lint: $(CFILES)
-	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
+lint: $(CFILES) tables.c
+	lint $(LINTOPTS) $(PREFLAGS) -I$(CDIR) $(CFILES) tables.c
 clean:
 	rm -f *.o tables.c tables.h debug.out cg tables.H
 
diff --git a/mach/ns/ncg/Makefile b/mach/ns/ncg/Makefile
index 75e23b0a3..05e2f3742 100644
--- a/mach/ns/ncg/Makefile
+++ b/mach/ns/ncg/Makefile
@@ -10,7 +10,7 @@ PREFLAGS=-I$(EMHOME)/h -I. -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) -O
 LDFLAGS=-i $(PFLAGS)
-LINTOPTS=-hbxac
+LINTOPTS=-bx
 LIBS=$(EMHOME)/lib/em_data.a
 CDIR=$(EMHOME)/mach/proto/ncg
 CGG=$(EMHOME)/lib/ncgg
@@ -72,8 +72,8 @@ tables.c: table $(CGG)
 	$(EMHOME)/lib/cpp $(TABLEFLAGS) table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
-lint: $(CFILES)
-	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
+lint: $(CFILES) tables.c
+	lint $(LINTOPTS) $(PREFLAGS) -I$(CDIR) $(CFILES) tables.c
 clean:
 	rm -f *.o tables.c tables.h debug.out cg tables.H
 
diff --git a/mach/pdp/ncg/Makefile b/mach/pdp/ncg/Makefile
index 75e23b0a3..05e2f3742 100644
--- a/mach/pdp/ncg/Makefile
+++ b/mach/pdp/ncg/Makefile
@@ -10,7 +10,7 @@ PREFLAGS=-I$(EMHOME)/h -I. -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) -O
 LDFLAGS=-i $(PFLAGS)
-LINTOPTS=-hbxac
+LINTOPTS=-bx
 LIBS=$(EMHOME)/lib/em_data.a
 CDIR=$(EMHOME)/mach/proto/ncg
 CGG=$(EMHOME)/lib/ncgg
@@ -72,8 +72,8 @@ tables.c: table $(CGG)
 	$(EMHOME)/lib/cpp $(TABLEFLAGS) table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
-lint: $(CFILES)
-	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
+lint: $(CFILES) tables.c
+	lint $(LINTOPTS) $(PREFLAGS) -I$(CDIR) $(CFILES) tables.c
 clean:
 	rm -f *.o tables.c tables.h debug.out cg tables.H
 
diff --git a/mach/proto/ncg/Makefile b/mach/proto/ncg/Makefile
index 75e23b0a3..05e2f3742 100644
--- a/mach/proto/ncg/Makefile
+++ b/mach/proto/ncg/Makefile
@@ -10,7 +10,7 @@ PREFLAGS=-I$(EMHOME)/h -I. -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) -O
 LDFLAGS=-i $(PFLAGS)
-LINTOPTS=-hbxac
+LINTOPTS=-bx
 LIBS=$(EMHOME)/lib/em_data.a
 CDIR=$(EMHOME)/mach/proto/ncg
 CGG=$(EMHOME)/lib/ncgg
@@ -72,8 +72,8 @@ tables.c: table $(CGG)
 	$(EMHOME)/lib/cpp $(TABLEFLAGS) table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
-lint: $(CFILES)
-	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
+lint: $(CFILES) tables.c
+	lint $(LINTOPTS) $(PREFLAGS) -I$(CDIR) $(CFILES) tables.c
 clean:
 	rm -f *.o tables.c tables.h debug.out cg tables.H