29 files changed, 19 insertions, 1084 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
@@ -19,3 +19,2 @@ lib_LTLIBRARIES=libgrecs.la
 libgrecs_la_SOURCES = $(GRECS_SRC)
-include_HEADERS = $(GRECS_HDR)
 m4datadir = $(datadir)/aclocal
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
@@ -19,7 +19 @@ 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
@@ -18,3 +18,2 @@ 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
@@ -77,7 +77,2 @@ GRECS_SRC = \
 
-GRECS_HDR = grecs.h grecsopt.h wordsplit.h
-if GRECS_COND_JSON
-  GRECS_HDR += json.h
-endif
-
 if GRECS_COND_SOCKADDR_LIST
@@ -86,7 +81,4 @@ endif
  
-noinst_HEADERS = grecs-locus.h
-
 EXTRA_DIST=\
  grecs-gram.h\
- grecs.hin\
  $(GRECS_EXTRA_BIND)\
@@ -98,4 +90,2 @@ EXTRA_DIST=\
 
-BUILT_SOURCES=grecs.h
-
 AM_CPPFLAGS = \
@@ -114 +104,5 @@ LEXCOMPILE = $(top_srcdir)/@GRECS_SUBDIR@/build-aux/yyrename '$(LEX) $(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
@@ -21,3 +21,2 @@
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <bind-gram.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
@@ -26,3 +26,2 @@
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <bind-gram.h>
diff --git a/src/cidr.c b/src/cidr.c
index bffa35e..7566fa6 100644
--- a/src/cidr.c
+++ b/src/cidr.c
@@ -24,2 +24,3 @@
 #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
@@ -21,3 +21,2 @@
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <dhcpd-gram.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
@@ -25,3 +25,2 @@
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <dhcpd-gram.h>
diff --git a/src/diag.c b/src/diag.c
index 1424437..bdbb407 100644
--- a/src/diag.c
+++ b/src/diag.c
@@ -20,3 +20,2 @@
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <stdlib.h>
diff --git a/src/format.c b/src/format.c
index 89202a0..af87329 100644
--- a/src/format.c
+++ b/src/format.c
@@ -20,2 +20,3 @@
 #include <grecs.h>
+#include <wordsplit.h>
 #include <stdio.h>
@@ -25,3 +26,2 @@
 #include <errno.h>
-#include "wordsplit.h"
 
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
@@ -21,3 +21,2 @@
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <grecs-gram.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
@@ -26,3 +26,2 @@
 #include <grecs.h>
-#include <grecs-locus.h>
 #include <grecs-gram.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);         \
-                else if ((Loc).beg.line != (Loc).end.line)              \
-                        fprintf(File, "%s:%u.%u-%u.%u",                 \
-                                (Loc).beg.file,                         \
-                                (Loc).beg.line, (Loc).beg.col,          \
-                                (Loc).end.line, (Loc).end.col);         \
-                else if ((Loc).beg.col != (Loc).end.col)                \
-                        fprintf(File, "%s:%u.%u-%u",                    \
-                                (Loc).beg.file,                         \
-                                (Loc).beg.line, (Loc).beg.col,          \
-                                (Loc).end.col);                         \
-                else                                                    \
-                        fprintf(File, "%s:%u.%u",                       \
-                                (Loc).beg.file,                         \
-                                (Loc).beg.line,                         \
-                                (Loc).beg.col);                         \
-        } while (0)
-
diff --git a/src/grecs.hin b/src/grecs.hin
deleted file mode 100644
index bfaaa49..0000000
--- a/src/grecs.hin
+++ /dev/null
@@ -1,584 +0,0 @@
-/* grecs - Gray's Extensible Configuration System -*- c -*-
-   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/>. */
-
-#ifndef _GRECS_H
-#define _GRECS_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>