diff --git a/daemon/bin/Makefile.am b/daemon/bin/Makefile.am
index 2df6699f69bcbded840cf21fa10fa5d63b7f2d06..6e340d78d3332e6ddd5f5bf843a58a868d2343c5 100644
--- a/daemon/bin/Makefile.am
+++ b/daemon/bin/Makefile.am
@@ -9,6 +9,7 @@ if HAVE_OSX
 libexec_PROGRAMS = ringcli
 ringcli_SOURCES = osxmain.cpp
 ringcli_CXXFLAGS = -I$(top_srcdir)/src \
+                   -I$(top_srcdir)/src/public \
                    -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
 ringcli_LDADD = $(top_builddir)/src/libring.la
 endif
@@ -20,8 +21,9 @@ libexec_PROGRAMS = dring
 
 dring_SOURCES = main.cpp
 
-dring_CXXFLAGS=-I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \
-				   -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
+dring_CXXFLAGS= -I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \
+                -I$(top_srcdir)/src/public \
+                -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
 
 dring_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libring.la
 endif
diff --git a/daemon/bin/dbus/Makefile.am b/daemon/bin/dbus/Makefile.am
index 33a89108b573a6fcef752497ab46680579e2787d..121fedef3df7df10a0c54a8a67653280b47d9716 100644
--- a/daemon/bin/dbus/Makefile.am
+++ b/daemon/bin/dbus/Makefile.am
@@ -48,7 +48,8 @@ libclient_dbus_la_SOURCES += dbusvideomanager.cpp dbusvideomanager.h
 endif
 
 libclient_dbus_la_CXXFLAGS = -I../ \
-							 -I$(top_srcdir)/src \
+            -I$(top_srcdir)/src \
+            -I$(top_srcdir)/src/public \
             -DPREFIX=\"$(prefix)\" \
             -DPROGSHAREDIR=\"${datadir}/ring\" \
             $(DBUSCPP_CFLAGS)
diff --git a/daemon/globals.mak b/daemon/globals.mak
index 9e23e0df5b75c65075652988d33bec574d3e106c..90f2f5162de1a6c46364c2bee1dd6a17e6e39fb3 100644
--- a/daemon/globals.mak
+++ b/daemon/globals.mak
@@ -25,6 +25,7 @@ AM_CPPFLAGS = \
 	-I$(src)/src \
 	-I$(src)/src/config \
 	-I$(src)/test \
+	-I$(src)/src/public \
 	$(SIP_CFLAGS) \
 	-DPREFIX=\"$(prefix)\" \
 	-DPROGSHAREDIR=\"${datadir}/ring\" \
diff --git a/daemon/src/ring.h b/daemon/src/public/ring.h
similarity index 100%
rename from daemon/src/ring.h
rename to daemon/src/public/ring.h