5 files changed, 31 insertions, 35 deletions
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index 44a044e708ce..89adc8b339f0 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -413,33 +413,6 @@ void printSetPropertyMixinBody(
     o  << "}\n\n";
 }
 
-void generateXPropertySetBodies(std::ostream& o,
-                                const OString & classname,
-                                const OString & interfaceName);
-void generateXFastPropertySetBodies(std::ostream& o,
-                                    const OString & classname,
-                                    const OString & interfaceName);
-void generateXPropertyAccessBodies(std::ostream& o,
-                                   const OString & classname,
-                                   const OString & interfaceName);
-
-void generateXAddInBodies(std::ostream& o, const OString & classname);
-
-void generateXLocalizable(std::ostream& o, const OString & classname);
-
-void generateXCompatibilityNamesBodies(std::ostream& o, const OString & classname);
-
-void generateXInitialization(std::ostream& o, const OString & classname);
-
-void generateXDispatch(std::ostream& o,
-                       const OString & classname,
-                       const ProtocolCmdMap & protocolCmdMap);
-
-void generateXDispatchProvider(std::ostream& o,
-                               const OString & classname,
-                               const ProtocolCmdMap & protocolCmdMap);
-
-
 void printMethods(std::ostream & o,
     ProgramOptions const & options, rtl::Reference< TypeManager > const & manager,
     OUString const & name, codemaker::GeneratedTypeSet & generated,
diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx
index e959e0cfa1a8..71764de0ada4 100644
--- a/unodevtools/source/skeletonmaker/javatypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx
@@ -410,10 +410,6 @@ void printSetPropertyMixinBody(
     o  << indentation << "}\n\n";
 }
 
-void generateXPropertySetBodies(std::ostream& o);
-void generateXFastPropertySetBodies(std::ostream& o);
-void generateXPropertyAccessBodies(std::ostream& o);
-
 void printMethods(std::ostream & o,
     ProgramOptions const & options, rtl::Reference< TypeManager > const & manager,
     OUString const & name,
@@ -626,10 +622,6 @@ void printConstructors(
     }
 }
 
-void generateDocumentation(std::ostream & o,
-    ProgramOptions const & options, rtl::Reference< TypeManager > const & manager,
-    OString const & type);
-
 void printServiceMembers(
     std::ostream & o, ProgramOptions const & options,
     rtl::Reference< TypeManager > const & manager,
diff --git a/unodevtools/source/skeletonmaker/skeletoncpp.hxx b/unodevtools/source/skeletonmaker/skeletoncpp.hxx
index 7f923c4dbe0e..d8c3f938ee55 100644
--- a/unodevtools/source/skeletonmaker/skeletoncpp.hxx
+++ b/unodevtools/source/skeletonmaker/skeletoncpp.hxx
@@ -63,6 +63,32 @@ void generateCalcAddin(ProgramOptions const & options,
                        rtl::Reference< TypeManager > const & manager,
                        std::vector< OString > const & types);
 
+void generateXPropertySetBodies(std::ostream& o,
+                                const OString & classname,
+                                const OString & interfaceName);
+void generateXFastPropertySetBodies(std::ostream& o,
+                                    const OString & classname,
+                                    const OString & interfaceName);
+void generateXPropertyAccessBodies(std::ostream& o,
+                                   const OString & classname,
+                                   const OString & interfaceName);
+
+void generateXAddInBodies(std::ostream& o, const OString & classname);
+
+void generateXLocalizable(std::ostream& o, const OString & classname);
+
+void generateXCompatibilityNamesBodies(std::ostream& o, const OString & classname);
+
+void generateXInitialization(std::ostream& o, const OString & classname);
+
+void generateXDispatch(std::ostream& o,
+                       const OString & classname,
+                       const ProtocolCmdMap & protocolCmdMap);
+
+void generateXDispatchProvider(std::ostream& o,
+                               const OString & classname,
+                               const ProtocolCmdMap & protocolCmdMap);
+
 } }
 
 #endif // INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONCPP_HXX
diff --git a/unodevtools/source/skeletonmaker/skeletonjava.hxx b/unodevtools/source/skeletonmaker/skeletonjava.hxx
index 3a45911857c7..4402fc173c0a 100644
--- a/unodevtools/source/skeletonmaker/skeletonjava.hxx
+++ b/unodevtools/source/skeletonmaker/skeletonjava.hxx
@@ -48,6 +48,10 @@ void generateDocumentation(std::ostream & o,
 
 void generateSkeleton(ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, std::vector< OString > const & types);
 
+void generateXPropertySetBodies(std::ostream& o);
+void generateXFastPropertySetBodies(std::ostream& o);
+void generateXPropertyAccessBodies(std::ostream& o);
+
 } }
 
 #endif // INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONJAVA_HXX
diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx
index d9d46667ffa2..888e6f4bbff4 100644
--- a/unodevtools/source/unodevtools/options.cxx
+++ b/unodevtools/source/unodevtools/options.cxx
@@ -22,6 +22,7 @@
 #include "codemaker/global.hxx"
 #include "rtl/ustring.hxx"
 #include "rtl/process.h"
+#include "unodevtools/options.hxx"
 
 using namespace ::rtl;