29 files changed, 20 insertions, 1085 deletions

diff --git a/src/Make-inst.am b/src/Make-inst.am
index 9dac1ad..a4b6aea 100644
--- a/src/Make-inst.am
+++ b/src/Make-inst.am
@@ -18,5 +18,4 @@ include Make.am
 lib_LTLIBRARIES=libgrecs.la
 libgrecs_la_SOURCES = $(GRECS_SRC)
-include_HEADERS = $(GRECS_HDR)
 m4datadir = $(datadir)/aclocal
 dist_m4data_DATA = libgrecs.m4
diff --git a/src/Make-shared.am b/src/Make-shared.am
index 8ec4a76..9a762a4 100644
--- a/src/Make-shared.am
+++ b/src/Make-shared.am
@@ -18,8 +18,2 @@ noinst_LTLIBRARIES=libgrecs.la
 libgrecs_la_SOURCES = $(GRECS_SRC)
 
-if GRECS_COND_INSTALLHEADERS
- grecsincludedir = @GRECS_INCLUDE_DIR@
- grecsinclude_HEADERS = $(GRECS_HDR)
-else 
- noinst_HEADERS += $(GRECS_HDR)
-endif
diff --git a/src/Make-static.am b/src/Make-static.am
index 7532562..2688b40 100644
--- a/src/Make-static.am
+++ b/src/Make-static.am
@@ -17,5 +17,4 @@ include Make.am
 noinst_LIBRARIES=libgrecs.a
 libgrecs_a_SOURCES = $(GRECS_SRC)
-noinst_HEADERS += $(GRECS_HDR)
 
 
diff --git a/src/Make.am b/src/Make.am
index cfae734..227973e 100644
--- a/src/Make.am
+++ b/src/Make.am
@@ -76,18 +76,10 @@ GRECS_SRC = \
  $(GRECS_PARSER_META1)
 
-GRECS_HDR = grecs.h grecsopt.h wordsplit.h
-if GRECS_COND_JSON
-  GRECS_HDR += json.h
-endif
-
 if GRECS_COND_SOCKADDR_LIST
   GRECS_SRC += sockaddr.c
 endif  
  
-noinst_HEADERS = grecs-locus.h
-
 EXTRA_DIST=\
  grecs-gram.h\
- grecs.hin\
  $(GRECS_EXTRA_BIND)\
  $(GRECS_EXTRA_DHCPD)\
@@ -97,6 +89,4 @@ EXTRA_DIST=\
  Make.am Make-inst.am Make-shared.am Make-static.am
 
-BUILT_SOURCES=grecs.h
-
 AM_CPPFLAGS = \
  -I$(srcdir)\
@@ -113,2 +103,6 @@ inc_DATA = $(PP_SETUP_FILE)
 LEXCOMPILE = $(top_srcdir)/@GRECS_SUBDIR@/build-aux/yyrename '$(LEX) $(LFLAGS) $(AM_LFLAGS)'
 YACCCOMPILE = $(top_srcdir)/@GRECS_SUBDIR@/build-aux/yyrename '$(YACC) $(YFLAGS) $(AM_YFLAGS)'
+
+
+
+
diff --git a/src/bind-gram.y b/src/bind-gram.y
index 4c8d394..18deb0d 100644
--- a/src/bind-gram.y
+++ b/src/bind-gram.y
@@ -20,5 +20,4 @@
 #endif
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <bind-gram.h>
 #include <stdlib.h>
diff --git a/src/bind-lex.l b/src/bind-lex.l
index 096d1f2..e0659e7 100644
--- a/src/bind-lex.l
+++ b/src/bind-lex.l
@@ -25,5 +25,4 @@
 
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <bind-gram.h>
 #include <unistd.h>
diff --git a/src/cidr.c b/src/cidr.c
index bffa35e..7566fa6 100644
--- a/src/cidr.c
+++ b/src/cidr.c
@@ -23,4 +23,5 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <stdlib.h>
 #include "grecs.h"
 
diff --git a/src/dhcpd-gram.y b/src/dhcpd-gram.y
index 86bfde9..11dd1b2 100644
--- a/src/dhcpd-gram.y
+++ b/src/dhcpd-gram.y
@@ -20,5 +20,4 @@
 #endif
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <dhcpd-gram.h>
 #include <stdlib.h>
diff --git a/src/dhcpd-lex.l b/src/dhcpd-lex.l
index 490fd72..79c7274 100644
--- a/src/dhcpd-lex.l
+++ b/src/dhcpd-lex.l
@@ -24,5 +24,4 @@
 
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <dhcpd-gram.h>
 #include <unistd.h>
diff --git a/src/diag.c b/src/diag.c
index 1424437..bdbb407 100644
--- a/src/diag.c
+++ b/src/diag.c
@@ -19,5 +19,4 @@
 #endif
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/format.c b/src/format.c
index 89202a0..af87329 100644
--- a/src/format.c
+++ b/src/format.c
@@ -19,4 +19,5 @@
 #endif
 #include <grecs.h>
+#include <wordsplit.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -24,5 +25,4 @@
 #include <string.h>
 #include <errno.h>
-#include "wordsplit.h"
 
 const char *
diff --git a/src/grecs-gram.y b/src/grecs-gram.y
index 4545c85..05ed2f5 100644
--- a/src/grecs-gram.y
+++ b/src/grecs-gram.y
@@ -20,5 +20,4 @@
 #endif
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <grecs-gram.h>
 #include <stdlib.h>
diff --git a/src/grecs-lex.l b/src/grecs-lex.l
index 5223765..113ee88 100644
--- a/src/grecs-lex.l
+++ b/src/grecs-lex.l
@@ -25,5 +25,4 @@
 
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <grecs-gram.h>
 #include <unistd.h>
diff --git a/src/grecs-locus.h b/src/grecs-locus.h
deleted file mode 100644
index b5573fd..0000000
--- a/src/grecs-locus.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* grecs - Gray's Extensible Configuration System
-   Copyright (C) 2007-2016 Sergey Poznyakoff
-
-   Grecs is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 3 of the License, or (at your
-   option) any later version.
-
-   Grecs is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with Grecs. If not, see <http://www.gnu.org/licenses/>. */
-
-#define YYLTYPE grecs_locus_t
-
-#define YYLLOC_DEFAULT(Current, Rhs, N)                          \
-        do {                                                     \
-                if (N) {                                         \
-                        (Current).beg = YYRHSLOC(Rhs, 1).beg;    \
-                        (Current).end = YYRHSLOC(Rhs, N).end;    \
-                } else {                                         \
-                        (Current).beg = YYRHSLOC(Rhs, 0).end;    \
-                        (Current).end = (Current).beg;           \
-                }                                                \
-        } while (0)
-
-#define YY_LOCATION_PRINT(File, Loc) do {                               \
-                if ((Loc).beg.col == 0)                                 \
-                        fprintf(File, "%s:%u",                          \
-                                (Loc).beg.file,                         \
-                                (Loc).beg.line);                        \
-                else if (strcmp((Loc).beg.file, (Loc).end.file))        \
-                        fprintf(File, "%s:%u.%u-%s:%u.%u",              \
-                                (Loc).beg.file,                         \
-                                (Loc).beg.line, (Loc).beg.col,          \
-                                (Loc).end.file,                         \
-                                (Loc).end.line, (Loc).end.col);         \