diff --git a/src/openoffice/Makefile.in b/src/openoffice/Makefile.in
index 573889c..12a7589 100644
--- a/src/openoffice/Makefile.in
+++ b/src/openoffice/Makefile.in
@@ -129,7 +129,7 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb
 Debug: $(BINDBG)/$(PACKAGE_NAME).oxt
 
 add: $(BINDBG)/$(PACKAGE_NAME).oxt
-	@$(UNOPKG) add --verbose --force $(BINDBG)/$(PACKAGE_NAME).oxt
+	@SHARED=false $(UNOPKG) add --verbose --force $(BINDBG)/$(PACKAGE_NAME).oxt
 
 $(BINDBG)/testprogram: $(OBJDBG)/testprogram@OBJEXT@ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
 	@echo $@ ...
@@ -141,7 +141,7 @@ $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@: \
 			$(CLASS_DEBUG_OBJECTS)
 	@echo "  LD   `basename $@`"
 	@$(MKDIR) `dirname $@`
-	$(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^
+	$(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^
 
 
 $(BINDBG)/$(PACKAGE_NAME).oxt: \
diff --git a/src/openoffice/service.cc b/src/openoffice/service.cc
index dd053e8..275fbd5 100644
--- a/src/openoffice/service.cc
+++ b/src/openoffice/service.cc
@@ -37,27 +37,25 @@
 
 /*---[ Implement ]-----------------------------------------------------------------------------------------*/
 
-using namespace pw3270_impl;
-
-Sequence< OUString > SAL_CALL getSupportedServiceNames_session_impl()
+namespace pw3270_impl
 {
-	Sequence<OUString> names(1);
-	names[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("pw3270.session"));
-	return names;
-}
+	Sequence< OUString > SAL_CALL getSupportedServiceNames_session_impl()
+	{
+		Sequence<OUString> names(1);
+		names[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("pw3270.session"));
+		return names;
+	}
 
-OUString SAL_CALL getImplementationName_session_impl()
-{
-	return OUString( RTL_CONSTASCII_USTRINGPARAM("pw3270.lib3270.session") );
-}
+	OUString SAL_CALL getImplementationName_session_impl()
+	{
+		return OUString( RTL_CONSTASCII_USTRINGPARAM("pw3270.lib3270.session") );
+	}
 
-Reference< XInterface > SAL_CALL create_session_impl(Reference< XComponentContext > const & xContext ) SAL_THROW( () )
-{
-    return static_cast< lang::XTypeProvider * >( new session_impl() );
-}
+	Reference< XInterface > SAL_CALL create_session_impl(Reference< XComponentContext > const & xContext ) SAL_THROW( () )
+	{
+		return static_cast< lang::XTypeProvider * >( new session_impl() );
+	}
 
-namespace pw3270_impl
-{
 	static struct ::cppu::ImplementationEntry s_component_entries [] =
 	{
 		{
--
libgit2 0.21.2