diff --git a/package/inc/ImplValidCharacters.hxx b/package/inc/ImplValidCharacters.hxx
deleted file mode 100644
index 54c4b9930ec3..000000000000
--- a/package/inc/ImplValidCharacters.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ImplValidCharacters.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _IMPL_VALID_CHARACTERS_HXX_
-#define _IMPL_VALID_CHARACTERS_HXX_
-
-#include <sal/types.h>
-
-static sal_Bool Impl_IsValidChar ( const sal_Unicode *pChar, sal_Int16 nLength, sal_Bool bSlashAllowed )
-{
-    for ( sal_Int16 i = 0 ; i < nLength ; i++ )
-    {
-        switch ( pChar[i] )
-        {
-            case '\\':
-            case '?':
-            case '<':
-            case '>':
-            case '\"':
-            case '|':
-            case ':':
-                return sal_False;
-            case '/':
-                if ( !bSlashAllowed )
-                    return sal_False;
-            break;
-            default:
-                if ( pChar[i] < 32  || pChar[i] > 127 )
-                    return sal_False;
-        }
-    }
-    return sal_True;
-}
-#endif
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx
index 8954db47d63c..65e8369e9095 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -37,9 +37,7 @@
 #include <PackageConstants.hxx>
 #include <ZipEntry.hxx>
 #include <ZipFile.hxx>
-#ifndef _VOS_REF_H_
 #include <vos/ref.hxx>
-#endif
 #include <com/sun/star/io/XOutputStream.hpp>
 
 #include <comphelper/storagehelper.hxx>
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx
index 51bcfa697213..78fbb7423aa7 100644
--- a/package/source/zippackage/ZipPackageEntry.cxx
+++ b/package/source/zippackage/ZipPackageEntry.cxx
@@ -31,10 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_package.hxx"
 #include <ZipPackageEntry.hxx>
-#ifndef _COM_SUN_STAR_PACKAGE_ZIP_ZIPCONSTANTS_HPP_
 #include <com/sun/star/packages/zip/ZipConstants.hpp>
-#endif
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
 
 #include <ZipPackageFolder.hxx>
 #include <ZipPackageStream.hxx>