diff --git a/src/oxt/Makefile.in b/src/oxt/Makefile.in
index 20bc84a..c2513d0 100644
--- a/src/oxt/Makefile.in
+++ b/src/oxt/Makefile.in
@@ -74,12 +74,17 @@ CXXFLAGS=@CXXFLAGS@ -Wno-strict-aliasing -I./include -I$(includedir)/libreoffice
 	@$(MKDIR) `dirname $@`
 	@$(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $<
 
+%.urd: /usr/share/idl/libreoffice/com/sun/star/uno/%.idl
+	@echo $@ ...
+	@$(MKDIR) `dirname $@`
+	@$(IDLC) -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $<
+
 %.rdb: %.urd
 	@echo $@ ...
 	@$(MKDIR) `dirname $@`
 	@$(REGMERGE) $@ /UCR $<
 
-$(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp Makefile
+$(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp include/com/sun/star/uno/XWeak.hpp *.hpp Makefile
 	@echo $< ...
 	@mkdir -p `dirname $@`
 	$(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ $<
@@ -93,6 +98,11 @@ include/pw3270/lib3270.hpp: pw3270.rdb
 	@$(MKDIR) `dirname $@`
 	@$(CPPUMAKER) -O./include -Tpw3270.lib3270 $(TYPES_RDB) $<
 
+include/com/sun/star/uno/%.hpp: %.rdb
+	@echo $@ ...
+	@$(MKDIR) `dirname $@`
+	@$(CPPUMAKER) -O./include $(TYPES_RDB) $<
+
 
 #---[ Debug targets ]----------------------------------------------------------
 
diff --git a/src/oxt/globals.hpp b/src/oxt/globals.hpp
index f3efa6d..b0c8dd2 100644
--- a/src/oxt/globals.hpp
+++ b/src/oxt/globals.hpp
@@ -47,12 +47,10 @@
 	#endif
 
 
-	#include <cppuhelper/supportsservice.hxx>
-
 	#include <cppuhelper/implbase2.hxx> // "3" implementing three interfaces
-//	#include <cppuhelper/factory.hxx>
+	#include <cppuhelper/factory.hxx>
 //	#include <cppuhelper/implementationentry.hxx>
-//	#include <com/sun/star/lang/XServiceInfo.hpp>
+	#include <com/sun/star/lang/XServiceInfo.hpp>
 //	#include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 	#include <pw3270/lib3270.hpp>
@@ -66,29 +64,9 @@
 	namespace pw3270_impl
 	{
 		// https://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/C%2B%2B/Class_Definition_with_Helper_Template_Classes
-		class sessionImpl
-		// : public lang::XServiceInfo
-		// ::cppu::WeakImplHelper2< ::pw3270::lib3270, lang::XServiceInfo >
-		{
-		};
-
-		/*
-		// https://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/C%2B%2B/Implementing_without_Helpers
-		class sessionImpl
+		class session_impl : public ::cppu::WeakImplHelper2< ::pw3270::lib3270, lang::XServiceInfo >
 		{
-			oslInterlockedCount m_refcount;
-
-		public:
-			inline sessionImpl() throw () : m_refcount( 0 )
-			{
-			}
-
-			// XInterface
-			virtual Any SAL_CALL queryInterface( Type const & type ) throw (RuntimeException);
-			virtual void SAL_CALL acquire() throw ();
-			virtual void SAL_CALL release() throw ();
 		};
-		*/
 
 	};
 
diff --git a/src/oxt/research.sh b/src/oxt/research.sh
index 31ef0e0..4bb9ad0 100755
--- a/src/oxt/research.sh
+++ b/src/oxt/research.sh
@@ -11,6 +11,7 @@ if [ "$?" != "0" ]; then
 	exit -1
 fi
 
+
 $REGMERGE pw3270.rdb /UCR pw3270.urd
 if [ "$?" != "0" ]; then
 	exit -1
@@ -22,5 +23,22 @@ if [ "$?" != "0" ]; then
 	exit -1
 fi
 
+# XWeak
+$IDLC -C -I$OO_SDK_HOME/idl -O. /usr/share/idl/libreoffice/com/sun/star/uno/XWeak.idl
+if [ "$?" != "0" ]; then
+	exit -1
+fi
+
+$REGMERGE XWeak.rdb /UCR XWeak.urd
+if [ "$?" != "0" ]; then
+	exit -1
+fi
+
+$CPPUMAKER -O./include $TYPES_RDB XWeak.rdb
+if [ "$?" != "0" ]; then
+	exit -1
+fi
+
+
 echo ok
 
--
libgit2 0.21.2