diff --git a/include/Makefile.am b/include/Makefile.am
index ec24242..073b09c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1,2 @@
-include_HEADERS	=	mdbtools.h mdbsql.h mdbodbc.h mdbprivate.h mdbver.h
+include_HEADERS	= mdbtools.h mdbsql.h mdbver.h
+noinst_HEADERS = mdbprivate.h
diff --git a/src/odbc/Makefile.am b/src/odbc/Makefile.am
index 852b019..8eb76a9 100644
--- a/src/odbc/Makefile.am
+++ b/src/odbc/Makefile.am
@@ -1,8 +1,7 @@
-include_HEADERS = connectparams.h # Should we really install that file?
-noinst_PROGRAMS	=	unittest 
+noinst_PROGRAMS	=	unittest
 lib_LTLIBRARIES	=	libmdbodbc.la
 AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS)
-libmdbodbc_la_SOURCES=	odbc.c connectparams.c
+libmdbodbc_la_SOURCES=	odbc.c connectparams.c mdbodbc.h connectparams.h
 libmdbodbc_la_LIBADD=	../libmdb/libmdb.la ../sql/libmdbsql.la
 libmdbodbc_la_LDFLAGS = -version-info 1:1:0 -export-symbols-regex '^(SQL|ODBCINST)'
 LIBS	=	@LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
diff --git a/include/mdbodbc.h b/src/odbc/mdbodbc.h
similarity index 100%
rename from include/mdbodbc.h
rename to src/odbc/mdbodbc.h
diff --git a/src/odbc/odbc.c b/src/odbc/odbc.c
index 48c4ff4..b8b214e 100644
--- a/src/odbc/odbc.c
+++ b/src/odbc/odbc.c
@@ -28,12 +28,9 @@
 
 #include <sql.h>
 #include <sqlext.h>
-
-#include <mdbodbc.h>
-
 #include <string.h>
 #include <stdio.h>
-
+#include "mdbodbc.h"
 #include "connectparams.h"
 
 //#define TRACE(x) fprintf(stderr,"Function %s\n", x);