12 files changed, 26 insertions, 18 deletions
diff --git a/registry/Executable_regview.mk b/registry/Executable_regview.mk
index 12baef21b55b..62b46acfc975 100644
--- a/registry/Executable_regview.mk
+++ b/registry/Executable_regview.mk
@@ -9,6 +9,11 @@
 
 $(eval $(call gb_Executable_Executable,regview))
 
+$(eval $(call gb_Executable_set_include,regview, \
+    $$(INCLUDE) \
+    -I$(SRCDIR)/registry/inc \
+))
+
 $(eval $(call gb_Executable_use_libraries,regview,\
     sal \
     reg \
diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk
index d389d86af730..7994d0284f17 100644
--- a/registry/Library_reg.mk
+++ b/registry/Library_reg.mk
@@ -14,6 +14,11 @@ $(eval $(call gb_Library_add_defs,reg,\
 	-DREG_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_set_include,reg, \
+    $$(INCLUDE) \
+    -I$(SRCDIR)/registry/inc \
+))
+
 $(eval $(call gb_Library_use_external,reg,boost_headers))
 
 $(eval $(call gb_Library_use_libraries,reg,\
diff --git a/include/registry/registry.h b/registry/inc/registry.h
index 68e6014cca40..8af32faa94ec 100644
--- a/include/registry/registry.h
+++ b/registry/inc/registry.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_REGISTRY_H
-#define INCLUDED_REGISTRY_REGISTRY_H
+#ifndef INCLUDED_REGISTRY_INC_REGISTRY_H
+#define INCLUDED_REGISTRY_INC_REGISTRY_H
 
 #include <stddef.h>
 #include <rtl/ustring.h>
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index ddfbac418482..148aded6f488 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_REGISTRY_SOURCE_KEYIMPL_HXX
 #define INCLUDED_REGISTRY_SOURCE_KEYIMPL_HXX
 
-#include <registry/registry.h>
+#include <registry.h>
 #include "regimpl.hxx"
 #include <rtl/ustring.hxx>
 
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 8d14bf664117..1dc6a4794a03 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -27,7 +27,7 @@
 #include <sal/types.h>
 #include <osl/endian.h>
 #include <osl/diagnose.h>
-#include <registry/reflread.hxx>
+#include <reflread.hxx>
 #include <sal/log.hxx>
 
 #include "registry/typereg_reader.hxx"
diff --git a/include/registry/reflread.hxx b/registry/source/reflread.hxx
index a298909305d8..9cd9447a6f5f 100644
--- a/include/registry/reflread.hxx
+++ b/registry/source/reflread.hxx
@@ -17,10 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_REFLREAD_HXX
-#define INCLUDED_REGISTRY_REFLREAD_HXX
+#ifndef INCLUDED_REGISTRY_SOURCE_REFLREAD_HXX
+#define INCLUDED_REGISTRY_SOURCE_REFLREAD_HXX
 
-#include <registry/regdllapi.h>
 #include <registry/refltype.hxx>
 #include <registry/regtype.h>
 #include <rtl/ustring.hxx>
@@ -83,7 +82,7 @@ struct RegistryTypeReader_Api
 
 /** the API initialization function.
 */
-REG_DLLPUBLIC RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api();
+RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api();
 
 #ifdef __cplusplus
 }
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 3096b8356cf8..ea269295ebb5 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -26,7 +26,7 @@
 #include "rtl/string.hxx"
 #include "rtl/ustring.hxx"
 
-#include "registry/reflwrit.hxx"
+#include "reflwrit.hxx"
 #include "registry/version.h"
 #include "registry/writer.h"
 
diff --git a/include/registry/reflwrit.hxx b/registry/source/reflwrit.hxx
index 45b278886ef5..0025ab013b38 100644
--- a/include/registry/reflwrit.hxx
+++ b/registry/source/reflwrit.hxx
@@ -17,10 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_REFLWRIT_HXX
-#define INCLUDED_REGISTRY_REFLWRIT_HXX
+#ifndef INCLUDED_REGISTRY_SOURCE_REFLWRIT_HXX
+#define INCLUDED_REGISTRY_SOURCE_REFLWRIT_HXX
 
-#include <registry/regdllapi.h>
 #include <registry/refltype.hxx>
 #include <registry/regtype.h>
 #include <rtl/ustring.hxx>
@@ -62,7 +61,7 @@ struct RegistryTypeWriter_Api
 
 /** the API initialization function.
 */
-REG_DLLPUBLIC RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api();
+RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api();
 
 #ifdef __cplusplus
 }
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index e20b41d13794..d31458af72bb 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -31,9 +31,9 @@
 #include <unistd.h>
 #endif
 
-#include <registry/reflread.hxx>
+#include <reflread.hxx>
 
-#include <registry/reflwrit.hxx>
+#include <reflwrit.hxx>
 
 #include "registry/reader.hxx"
 #include "registry/refltype.hxx"
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index 6d38cb796947..e1cf2832238b 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -23,7 +23,7 @@
 #include <set>
 #include <unordered_map>
 
-#include <registry/registry.h>
+#include <registry.h>
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
 #include <store/store.hxx>
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index 345e0bf6f8be..bc73fcb63d10 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <registry/registry.h>
+#include <registry.h>
 #include <registry/registry.hxx>
 
 #include <osl/process.h>
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index e48e0d8156e1..3682d9054012 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "registry/registry.h"
+#include "registry.h"
 #include "fileurl.hxx"
 
 #include "rtl/ustring.hxx"