Merge branches/gbuild-reintegration to trunk.

174 files changed, 2026 insertions, 7256 deletions

diff --git a/offapi/com/sun/star/animations/TargetPropertiesCreator.idl b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
new file mode 100644
index 000000000000..6aedaf0835f7
--- /dev/null
+++ b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
@@ -0,0 +1,40 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_animations_TargetPropertiesCreator_idl__
+#define __com_sun_star_animations_TargetPropertiesCreator_idl__
+
+#ifndef __com_sun_star_animations_TargetProperties_idl__
+#include <com/sun/star/animations/XTargetPropertiesCreator.idl>
+#endif
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module animations {
+
+//=============================================================================
+
+service TargetPropertiesCreator: XTargetPropertiesCreator;
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
index bf03c7eeaa4e..d79866c2e24e 100644
--- a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
+++ b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
@@ -67,8 +67,6 @@ interface XTargetPropertiesCreator : ::com::sun::star::uno::XInterface
 
 //=============================================================================
 
-service TargetPropertiesCreator: XTargetPropertiesCreator;
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/animations/makefile.mk b/offapi/com/sun/star/animations/makefile.mk
deleted file mode 100644
index 61d92bff2561..000000000000
--- a/offapi/com/sun/star/animations/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssanimations
-PACKAGE=com$/sun$/star$/animations
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AnimationAdditiveMode.idl\
-    AnimationCalcMode.idl\
-    AnimationColorSpace.idl\
-    AnimationEndSync.idl\
-    AnimationFill.idl\
-    AnimationNodeType.idl\
-    AnimationRestart.idl\
-    AnimationTransformType.idl\
-    AnimationValueType.idl\
-    Event.idl\
-    EventTrigger.idl\
-    TargetProperties.idl \
-    TimeFilterPair.idl\
-    Timing.idl\
-    TransitionSubType.idl\
-    TransitionType.idl\
-    ValuePair.idl\
-    XAnimate.idl\
-    XAnimateColor.idl\
-    XAnimateMotion.idl\
-    XAnimateSet.idl\
-    XAnimateTransform.idl\
-    XAnimationNode.idl\
-    XAnimationNodeSupplier.idl\
-    XAudio.idl\
-    XIterateContainer.idl\
-    XTargetPropertiesCreator.idl \
-    XTimeContainer.idl\
-    XTransitionFilter.idl\
-    XCommand.idl\
-    XAnimationListener.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/auth/makefile.mk b/offapi/com/sun/star/auth/makefile.mk
deleted file mode 100644
index 6d6877cce762..000000000000
--- a/offapi/com/sun/star/auth/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-PRJ = ..$/..$/..$/..
-PRJNAME=offapi
-
-TARGET = cssauth
-PACKAGE = com$/sun$/star$/auth
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    AuthenticationFailedException.idl	\
-    InvalidArgumentException.idl		\
-    InvalidContextException.idl			\
-    InvalidCredentialException.idl		\
-    InvalidPrincipalException.idl		\
-    PersistenceFailureException.idl		\
-    UnsupportedException.idl			\
-    SSOManagerFactory.idl				\
-    SSOPasswordCache.idl				\
-    XSSOAcceptorContext.idl				\
-    XSSOContext.idl						\
-    XSSOInitiatorContext.idl			\
-    XSSOManager.idl						\
-    XSSOManagerFactory.idl				\
-    XSSOPasswordCache.idl
-
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/awt/grid/makefile.mk b/offapi/com/sun/star/awt/grid/makefile.mk
deleted file mode 100644
index eefcc8d82f7b..000000000000
--- a/offapi/com/sun/star/awt/grid/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssawtgrid
-PACKAGE=com$/sun$/star$/awt$/grid
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    GridColumnEvent.idl\
-    GridDataEvent.idl\
-    GridSelectionEvent.idl\
-    XGridSelectionListener.idl\
-    XGridRowSelection.idl\
-    XGridColumn.idl\
-     XGridColumnListener.idl\
-    XGridDataListener.idl\
-    DefaultGridDataModel.idl\
-    XGridDataModel.idl\
-    XMutableGridDataModel.idl\
-    XGridColumnModel.idl\
-    XGridControl.idl\
-    UnoControlGrid.idl\
-    UnoControlGridModel.idl\
-    GridInvalidDataException.idl\
-    GridInvalidModelException.idl\
-    XSortableGridData.idl\
-    SortableGridDataModel.idl\
-    XSortableMutableGridDataModel.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/awt/tab/makefile.mk b/offapi/com/sun/star/awt/tab/makefile.mk
deleted file mode 100644
index dbaa277471e3..000000000000
--- a/offapi/com/sun/star/awt/tab/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssawttab
-PACKAGE=com$/sun$/star$/awt$/tab
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    TabPageActivatedEvent.idl\
-    XTabPageContainerListener.idl\
-    XTabPageModel.idl\
-    XTabPage.idl\
-    XTabPageContainerModel.idl\
-    XTabPageContainer.idl\
-    UnoControlTabPage.idl\
-    UnoControlTabPageModel.idl\
-    UnoControlTabPageContainer.idl\
-    UnoControlTabPageContainerModel.idl
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/awt/tree/makefile.mk b/offapi/com/sun/star/awt/tree/makefile.mk
deleted file mode 100644
index 8ee1b4769062..000000000000
--- a/offapi/com/sun/star/awt/tree/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssawttree
-PACKAGE=com$/sun$/star$/awt$/tree
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    MutableTreeDataModel.idl\
-    ExpandVetoException.idl\
-    MutableTreeNode.idl\
-    TreeControl.idl\
-    TreeControlModel.idl\
-    TreeDataModelEvent.idl\
-    TreeExpansionEvent.idl\
-    XMutableTreeDataModel.idl\
-    XMutableTreeNode.idl\
-    XTreeControl.idl\
-    XTreeDataModel.idl\
-    XTreeDataModelListener.idl\
-    XTreeExpansionListener.idl\
-    XTreeNode.idl\
-    XTreeEditListener.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/chart/makefile.mk b/offapi/com/sun/star/chart/makefile.mk
deleted file mode 100644
index 41c28cef77cb..000000000000
--- a/offapi/com/sun/star/chart/makefile.mk
+++ /dev/null
@@ -1,123 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csschart
-PACKAGE=com$/sun$/star$/chart
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleChartElement.idl\
-    AccessibleChartDocumentView.idl\
-    AreaDiagram.idl\
-    BarDiagram.idl\
-    BubbleDiagram.idl\
-    Chart3DBarProperties.idl\
-    ChartArea.idl\
-    ChartAxis.idl\
-    ChartAxisArrangeOrderType.idl\
-    ChartAxisAssign.idl\
-    ChartAxisMarks.idl\
-    ChartAxisPosition.idl\
-    ChartAxisLabelPosition.idl\
-    ChartAxisMarkPosition.idl\
-    ChartAxisType.idl\
-    ChartAxisXSupplier.idl\
-    ChartAxisYSupplier.idl\
-    ChartAxisZSupplier.idl\
-    ChartData.idl\
-    ChartDataArray.idl\
-    ChartDataCaption.idl\
-    ChartDataChangeEvent.idl\
-    ChartDataChangeType.idl\
-    ChartDataPoint.idl\
-    ChartDataPointProperties.idl\
-    ChartDataRow.idl\
-    ChartDataRowProperties.idl\
-    ChartDataRowSource.idl\
-    ChartDataValue.idl\
-    ChartDocument.idl\
-    ChartErrorCategory.idl\
-    ChartErrorIndicatorType.idl\
-    ChartGrid.idl\
-    ChartLegend.idl\
-    ChartLegendPosition.idl\
-    ChartLegendExpansion.idl \
-    ChartLine.idl\
-    ChartPieSegmentProperties.idl\
-    ChartRegressionCurveType.idl\
-    ChartSeriesAddress.idl\
-    ChartSolidType.idl\
-    ChartStatistics.idl\
-    ChartSymbolType.idl\
-    ChartTableAddressSupplier.idl\
-    ChartTitle.idl\
-    ChartTwoAxisXSupplier.idl\
-    ChartTwoAxisYSupplier.idl\
-    DataLabelPlacement.idl\
-    TimeIncrement.idl \
-    Diagram.idl\
-    Dim3DDiagram.idl\
-    DonutDiagram.idl\
-    FilledNetDiagram.idl\
-    LineDiagram.idl\
-    MissingValueTreatment.idl\
-    NetDiagram.idl\
-    PieDiagram.idl\
-    StackableDiagram.idl\
-    StockDiagram.idl\
-    TimeUnit.idl\
-    TimeInterval.idl\
-    X3DDefaultSetter.idl\
-    X3DDisplay.idl\
-    XAxis.idl\
-    XAxisSupplier.idl\
-    XAxisXSupplier.idl\
-    XAxisYSupplier.idl\
-    XAxisZSupplier.idl\
-    XChartData.idl\
-    XChartDataArray.idl\
-    XChartDataChangeEventListener.idl\
-    XChartDocument.idl\
-    XComplexDescriptionAccess.idl\
-    XDateCategories.idl\
-    XDiagram.idl\
-    XDiagramPositioning.idl\
-    XStatisticDisplay.idl\
-    XTwoAxisXSupplier.idl\
-    XTwoAxisYSupplier.idl\
-    XSecondAxisTitleSupplier.idl\
-    XYDiagram.idl\
-    ErrorBarStyle.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
new file mode 100644
index 000000000000..f542cebf0de1
--- /dev/null
+++ b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
@@ -0,0 +1,45 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_DatabaseDataProvider_idl__
+#define __com_sun_star_report_DatabaseDataProvider_idl__
+
+#include <com/sun/star/chart2/data/XDatabaseDataProvider.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module chart2 { module data {
+
+//=============================================================================
+
+service DatabaseDataProvider : XDatabaseDataProvider
+{
+    createWithConnection([in] com::sun::star::sdbc::XConnection connection);
+};
+//=============================================================================
+
+ }; }; }; };  };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index f6b4ef93d4ce..46460a0317c8 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -206,10 +206,6 @@ interface XDatabaseDataProvider
     [attribute,bound] string DataSourceName;
 };
 
-service DatabaseDataProvider : XDatabaseDataProvider
-{
-    createWithConnection([in] com::sun::star::sdbc::XConnection connection);
-};
 //=============================================================================
 
  }; }; }; };  };
diff --git a/offapi/com/sun/star/chart2/data/makefile.mk b/offapi/com/sun/star/chart2/data/makefile.mk
deleted file mode 100644
index 60d3692107a8..000000000000
--- a/offapi/com/sun/star/chart2/data/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-TARGET=csschart2data
-PACKAGE=com$/sun$/star$/chart2$/data
-
-PRJNAME=chart2
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-#-------------------------------------------------------------------
-
-IDLFILES= \
-    DataSequenceRole.idl \
-    HighlightedRange.idl \
-    LabelOrigin.idl \
-    XDataProvider.idl \
-    XDataReceiver.idl \
-    XDataSequence.idl \
-    XDataSink.idl \
-    XDataSource.idl \
-    XLabeledDataSequence.idl \
-    XNumericalDataSequence.idl \
-    XRangeHighlighter.idl \
-    XRangeXMLConversion.idl \
-    XTextualDataSequence.idl \
-    XDatabaseDataProvider.idl
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/chart2/makefile.mk b/offapi/com/sun/star/chart2/makefile.mk
deleted file mode 100644
index 8d2d0bfe5a11..000000000000
--- a/offapi/com/sun/star/chart2/makefile.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-TARGET=csschart2
-PACKAGE=com$/sun$/star$/chart2
-
-PRJNAME=offapi
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-#-------------------------------------------------------------------
-
-IDLFILES= \
-    AxisType.idl \
-    AxisOrientation.idl \
-    CoordinateSystemTypeID.idl \
-    CurveStyle.idl \
-    DataPointGeometry3D.idl \
-    DataPointLabel.idl \
-    FillBitmap.idl \
-    IncrementData.idl \
-    InterpretedData.idl \
-    LegendPosition.idl \
-    LightSource.idl \
-    PieChartOffsetMode.idl \
-    RelativePosition.idl \
-    RelativeSize.idl \
-    ScaleData.idl \
-    StackingDirection.idl \
-    SubIncrement.idl \
-    Symbol.idl \
-    SymbolStyle.idl \
-    TickmarkStyle.idl \
-    TransparencyStyle.idl \
-    XAnyDescriptionAccess.idl\
-    XAxis.idl \
-    XCoordinateSystem.idl \
-    XCoordinateSystemContainer.idl \
-    XChartDocument.idl \
-    XChartShape.idl \
-    XChartShapeContainer.idl \
-    XChartType.idl \
-    XChartTypeContainer.idl \
-    XChartTypeManager.idl \
-    XChartTypeTemplate.idl \
-    XColorScheme.idl \
-    XDataInterpreter.idl \
-    XDataSeries.idl \
-    XDataSeriesContainer.idl \
-    XDefaultSizeTransmitter.idl \
-    XDiagram.idl \
-    XDiagramProvider.idl \
-    XFastPropertyState.idl \
-    XFormattedString.idl \
-    XInternalDataProvider.idl \
-    XLabeled.idl \
-    XLegend.idl \
-    XRegressionCurve.idl \
-    XRegressionCurveCalculator.idl \
-    XRegressionCurveContainer.idl \
-    XScaling.idl \
-    XStyleSupplier.idl \
-    XTarget.idl \
-    XTitle.idl \
-    XTitled.idl \
-    XTransformation.idl \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/configuration/backend/makefile.mk b/offapi/com/sun/star/configuration/backend/makefile.mk
deleted file mode 100644
index a60a98a264e1..000000000000
--- a/offapi/com/sun/star/configuration/backend/makefile.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ = ..$/..$/..$/..$/..
-PRJNAME=offapi
-
-TARGET = csscbackend
-PACKAGE = com$/sun$/star$/configuration$/backend
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    Backend.idl				\
-    SingleBackend.idl	    \
-    LocalSingleBackend.idl	\
-    LdapSingleBackend.idl	\
-    BackendAdapter.idl		\
-    SingleBackendAdapter.idl \
-    OfflineBackend.idl		\
-    OnlineBackend.idl		\
-    HierarchyBrowser.idl	\
-    LocalHierarchyBrowser.idl	\
-    DataImporter.idl		\
-    LocalDataImporter.idl	\
-    LayerFilter.idl	\
-    LayerUpdateMerger.idl	\
-    Importer.idl			\
-    MergeImporter.idl		\
-    CopyImporter.idl		\
-    Schema.idl				\
-    Layer.idl				\
-    UpdatableLayer.idl      \
-    SingleLayerStratum.idl  \
-    LocalSingleStratum.idl  \
-    LdapSingleStratum.idl	\
-    MultiStratumBackend.idl \
-    MultiLayerStratum.idl   \
-    LdapMultiLayerStratum.idl \
-    SchemaSupplier.idl	    \
-    LocalSchemaSupplier.idl \
-    PlatformBackend.idl		\
-    SystemIntegration.idl	\
-    LayerDescriber.idl		\
-    InteractionHandler.idl  \
-    XBackend.idl			\
-    XBackendEntities.idl	\
-    XSchemaSupplier.idl		\
-    XVersionedSchemaSupplier.idl		\
-    XSingleLayerStratum.idl	\
-    XMultiLayerStratum.idl	\
-    XSchema.idl				\
-    XLayer.idl				\
-    XCompositeLayer.idl     \
-    XUpdatableLayer.idl     \
-    XSchemaHandler.idl		\
-    XLayerHandler.idl		\
-    XUpdateHandler.idl      \
-    XLayerImporter.idl		\
-    XBackendChangesNotifier.idl	\
-    XBackendChangesListener.idl	\
-    XLayerContentDescriber.idl	\
-    ComponentChangeEvent.idl	\
-    TemplateIdentifier.idl  \
-    SchemaAttribute.idl     \
-    NodeAttribute.idl       \
-    PropertyInfo.idl			\
-    MergeRecoveryRequest.idl	\
-    MalformedDataException.idl	\
-    BackendSetupException.idl	\
-    StratumCreationException.idl	\
-    AuthenticationFailedException.idl	\
-    CannotConnectException.idl	\
-    InvalidAuthenticationMechanismException.idl \
-    BackendAccessException.idl	\
-    ConnectionLostException.idl	\
-    InsufficientAccessRightsException.idl
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/configuration/backend/xml/makefile.mk b/offapi/com/sun/star/configuration/backend/xml/makefile.mk
deleted file mode 100644
index e6035108cf32..000000000000
--- a/offapi/com/sun/star/configuration/backend/xml/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ = ..$/..$/..$/..$/..$/..
-PRJNAME=offapi
-
-TARGET = csscbxml
-PACKAGE = com$/sun$/star$/configuration$/backend$/xml
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    SchemaParser.idl				\
-    LayerParser.idl				\
-    LayerWriter.idl				\
-
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/configuration/bootstrap/makefile.mk b/offapi/com/sun/star/configuration/bootstrap/makefile.mk
deleted file mode 100644
index 6dc0a1412baf..000000000000
--- a/offapi/com/sun/star/configuration/bootstrap/makefile.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ = ..$/..$/..$/..$/..
-PRJNAME=offapi
-
-TARGET = csscbootstrap
-PACKAGE = com$/sun$/star$/configuration$/bootstrap
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    BootstrapContext.idl				\
-
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/configuration/makefile.mk b/offapi/com/sun/star/configuration/makefile.mk
deleted file mode 100644
index 62956f76c365..000000000000
--- a/offapi/com/sun/star/configuration/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssconfiguration
-PACKAGE=com$/sun$/star$/configuration
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AdministrationProvider.idl \
-    DefaultProvider.idl \
-    CannotLoadConfigurationException.idl \
-    CorruptedConfigurationException.idl \
-    CorruptedUIConfigurationException.idl \
-    InvalidBootstrapFileException.idl \
-    MissingBootstrapFileException.idl \
-    InstallationIncompleteException.idl \
-    ConfigurationAccess.idl\
-    ConfigurationProvider.idl\
-    ConfigurationUpdateAccess.idl\
-    ConfigurationRegistry.idl\
-    HierarchyElement.idl\
-    AccessRootElement.idl\
-    UpdateRootElement.idl\
-    GroupElement.idl\
-    SetElement.idl\
-    HierarchyAccess.idl\
-    GroupAccess.idl\
-    GroupUpdate.idl\
-    SetAccess.idl\
-    SetUpdate.idl\
-    SimpleSetAccess.idl\
-    SimpleSetUpdate.idl\
-    PropertyHierarchy.idl\
-    XTemplateContainer.idl\
-    XTemplateInstance.idl\
-    Update.idl \
-    XUpdate.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/datatransfer/clipboard/makefile.mk b/offapi/com/sun/star/datatransfer/clipboard/makefile.mk
deleted file mode 100644
index aa66f7547b8d..000000000000
--- a/offapi/com/sun/star/datatransfer/clipboard/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdclipboard
-PACKAGE=com$/sun$/star$/datatransfer$/clipboard
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ClipboardEvent.idl \
-    ClipboardManager.idl \
-    GenericClipboard.idl \
-    RenderingCapabilities.idl \
-    SystemClipboard.idl \
-    XClipboard.idl \
-    XClipboardEx.idl \
-    XClipboardFactory.idl \
-    XClipboardListener.idl \
-    XClipboardManager.idl \
-    XClipboardNotifier.idl \
-    XClipboardOwner.idl \
-    XFlushableClipboard.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/datatransfer/dnd/makefile.mk b/offapi/com/sun/star/datatransfer/dnd/makefile.mk
deleted file mode 100644
index 36efa5ff1ff7..000000000000
--- a/offapi/com/sun/star/datatransfer/dnd/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssddnd
-PACKAGE=com$/sun$/star$/datatransfer$/dnd
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    DNDConstants.idl \
-    DragGestureEvent.idl \
-    DragSourceEvent.idl \
-    DragSourceDragEvent.idl \
-    DragSourceDropEvent.idl \
-    DropTargetDragEvent.idl \
-    DropTargetDragEnterEvent.idl \
-    DropTargetDropEvent.idl \
-    DropTargetEvent.idl \
-    InvalidDNDOperationException.idl \
-    OleDragSource.idl	\
-    OleDropTarget.idl \
-    X11DragSource.idl \
-    X11DropTarget.idl \
-    XAutoscroll.idl\
-    XDragGestureListener.idl \
-    XDragGestureRecognizer.idl \
-    XDragSource.idl \
-    XDragSourceContext.idl \
-    XDragSourceListener.idl \
-    XDropTarget.idl \
-    XDropTargetDragContext.idl \
-    XDropTargetDropContext.idl \
-    XDropTargetListener.idl \
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/datatransfer/makefile.mk b/offapi/com/sun/star/datatransfer/makefile.mk
deleted file mode 100644
index 01fe58d2ad73..000000000000
--- a/offapi/com/sun/star/datatransfer/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdatatransfer
-PACKAGE=com$/sun$/star$/datatransfer
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        XTransferableSupplier.idl \
-    DataFlavor.idl \
-    UnsupportedFlavorException.idl \
-    XTransferable.idl \
-    XTransferableEx.idl \
-    XSystemTransferable.idl \
-    XTransferableSource.idl \
-    XTransferDataAccess.idl \
-    XMimeContentType.idl \
-    XMimeContentTypeFactory.idl \
-    MimeContentTypeFactory.idl\
-    DataFormatTranslator.idl\
-    XDataFormatTranslator.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/deployment/makefile.mk b/offapi/com/sun/star/deployment/makefile.mk
deleted file mode 100644
index 2f5c2b0545de..000000000000
--- a/offapi/com/sun/star/deployment/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ = ..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET = cssdeployment
-PACKAGE = com$/sun$/star$/deployment
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-        DeploymentException.idl \
-        XPackageTypeInfo.idl \
-        XPackage.idl \
-        XPackageRegistry.idl \
-        PackageRegistryBackend.idl \
-        XPackageManager.idl \
-        XPackageManagerFactory.idl \
-        XExtensionManager.idl \
-        ExtensionManager.idl \
-        thePackageManagerFactory.idl \
-        DependencyException.idl \
-        LicenseException.idl \
-        VersionException.idl \
-        InstallException.idl \
-        UpdateInformationEntry.idl \
-        XUpdateInformationProvider.idl \
-        UpdateInformationProvider.idl \
-        XPackageInformationProvider.idl \
-        PackageInformationProvider.idl \
-        PlatformException.idl \
-        InvalidRemovedParameterException.idl \
-        ExtensionRemovedException.idl \
-        Prerequisites.idl
-
-.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/deployment/test/makefile.mk b/offapi/com/sun/star/deployment/test/makefile.mk
deleted file mode 100644
index 7312ffb69752..000000000000
--- a/offapi/com/sun/star/deployment/test/makefile.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ = ..$/..$/..$/..$/..
-
-PRJNAME = api
-
-TARGET = cssdeploymenttest
-PACKAGE = com$/sun$/star$/deployment$/test
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-      SmoketestCommandEnvironment.idl
-
-.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/deployment/ui/makefile.mk b/offapi/com/sun/star/deployment/ui/makefile.mk
deleted file mode 100644
index 9e9b5338c2bb..000000000000
--- a/offapi/com/sun/star/deployment/ui/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ = ..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET = cssdeploymentui
-PACKAGE = com$/sun$/star$/deployment$/ui
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    PackageManagerDialog.idl \
-    LicenseDialog.idl \
-    UpdateRequiredDialog.idl
-
-.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/document/makefile.mk b/offapi/com/sun/star/document/makefile.mk
deleted file mode 100644
index cee8a807beae..000000000000
--- a/offapi/com/sun/star/document/makefile.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdocument
-PACKAGE=com$/sun$/star$/document
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AmbigousFilterRequest.idl\
-    BrokenPackageRequest.idl\
-    CorruptedFilterConfigurationException.idl\
-    ChangedByOthersRequest.idl\
-    DocumentEvent.idl\
-    DocumentInfo.idl\
-    DocumentProperties.idl\
-    EventDescriptor.idl\
-    EventObject.idl\
-    Events.idl\
-    ExportFilter.idl\
-    ExtendedTypeDetection.idl\
-    ExtendedTypeDetectionFactory.idl\
-    FilterAdapter.idl\
-    FilterFactory.idl\
-    FilterOptionsRequest.idl\
-    HeaderFooterSettings.idl\
-    ImportFilter.idl\
-    LinkTarget.idl\
-    LinkTargets.idl\
-    LockFileIgnoreRequest.idl\
-    LockedDocumentRequest.idl\
-    LockedOnSavingRequest.idl\
-    MacroExecMode.idl\
-    MediaDescriptor.idl\
-    NoSuchFilterRequest.idl\
-    OfficeDocument.idl\
-    OleEmbeddedServerRegistration.idl\
-    OwnLockOnDocumentRequest.idl\
-    PDFDialog.idl\
-    PrinterIndependentLayout.idl\
-    RedlineDisplayType.idl \
-    Settings.idl\
-    StandaloneDocumentInfo.idl\
-    TypeDetection.idl\
-    UpdateDocMode.idl\
-    XActionLockable.idl\
-    XBinaryStreamResolver.idl\
-    XDocumentEventBroadcaster.idl\
-    XDocumentEventListener.idl\
-    XDocumentInfo.idl\
-    XDocumentInfoSupplier.idl\
-    XDocumentInsertable.idl\
-    XDocumentProperties.idl\
-    XDocumentPropertiesSupplier.idl\
-    XDocumentRecovery.idl\
-    XDocumentSubStorageSupplier.idl\
-    XEmbeddedObjectResolver.idl\
-    XEmbeddedObjectSupplier.idl\
-    XEmbeddedObjectSupplier2.idl\
-    XEmbeddedScripts.idl\
-    XEventBroadcaster.idl\
-    XEventListener.idl\
-    XEventsSupplier.idl\
-    XExporter.idl\
-    XExtendedFilterDetection.idl\
-    XFilter.idl\
-    XFilterAdapter.idl\
-    XGraphicObjectResolver.idl\
-    XImporter.idl\
-    XInteractionFilterOptions.idl\
-    XInteractionFilterSelect.idl\
-    XLinkTargetSupplier.idl\
-    XMimeTypeInfo.idl\
-    XOOXMLDocumentPropertiesImporter.idl\
-    XRedlinesSupplier.idl \
-    XScriptInvocationContext.idl\
-    XStandaloneDocumentInfo.idl\
-    XStorageBasedDocument.idl\
-    XStorageChangeListener.idl\
-    XTypeDetection.idl\
-    XViewDataSupplier.idl\
-    LinkUpdateModes.idl\
-    XDocumentRevisionListPersistence.idl\
-    DocumentRevisionListPersistence.idl \
-    XDocumentLanguages.idl \
-    XCodeNameQuery.idl \
-    XUndoAction.idl \
-    XUndoManager.idl \
-    XUndoManagerListener.idl \
-    XUndoManagerSupplier.idl \
-    UndoManagerEvent.idl \
-    EmptyUndoStackException.idl \
-    UndoContextNotClosedException.idl \
-    UndoFailedException.idl \
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/drawing/CanvasFeature.idl b/offapi/com/sun/star/drawing/CanvasFeature.idl
new file mode 100644
index 000000000000..79c3f6d37b75
--- /dev/null
+++ b/offapi/com/sun/star/drawing/CanvasFeature.idl
@@ -0,0 +1,39 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_drawing_CanvasFeature_idl__
+#define __com_sun_star_drawing_CanvasFeature_idl__
+
+module com { module sun { module star { module drawing {
+
+constants CanvasFeature
+{
+    const short None = 0;
+    const short SpriteCanvas = 1;
+};
+
+
+
+}; }; }; }; // ::com::sun::star::drawing
+
+#endif
diff --git a/offapi/com/sun/star/drawing/SlideSorter.idl b/offapi/com/sun/star/drawing/SlideSorter.idl
index bfb58a739b0d..0e60bdacba36 100644
--- a/offapi/com/sun/star/drawing/SlideSorter.idl
+++ b/offapi/com/sun/star/drawing/SlideSorter.idl
@@ -42,92 +42,12 @@
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
+#ifndef __com_sun_star_drawing_XSlideSorterBase_idl__
+#include <com/sun/star/drawing/XSlideSorterBase.idl>
+#endif
 
 module com {  module sun {  module star {  module drawing {
 
-/** This interface exists only because services do not directly support
-    multiple inheritance and attributes.
-    <p>It provides the interfaces and attributes that every object that
-    implements the <type>SlideSorter</type> service.</p>
-*/
-interface XSlideSorterBase
-{
-    /** This interface is included to mark a <type>SlideSorter</type> object
-        as view of the drawing framework and to provide a
-        <type>ResourceId</type>.
-    */
-    interface ::com::sun::star::drawing::framework::XView;
-
-    /** The <type>XDrawView</type> interface is included to provide access
-        to the current slide (especially write access).
-    */
-    interface ::com::sun::star::drawing::XDrawView;
-
-    /** The set of slides that are displayed by the implementing object.
-        <p>The default value is the set of all slides of the document for
-        which a slide sorter is created.</p>
-    */
-    [attribute] ::com::sun::star::container::XIndexAccess DocumentSlides;
-
-    /** Set this flag to <TRUE/> in order to have the current slide
-        highlighted.
-        <p>The default value is <FALSE/>.</p>
-    */
-    [attribute] boolean IsHighlightCurrentSlide;
-
-    /** Set this flag to <TRUE/> in order to visualize the selection of
-        slides (typically a bold frame around the selected slides).
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsShowSelection;
-
-    /** Set this flag to <TRUE/> to visualize to where the focus is by
-        showing a dotted rectangle around the focused slide.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsShowFocus;
-
-    /** When this flag has the value <TRUE/> then every time the current
-        slide is changed the visual area is shifted so that the new current
-        slide is display in the center of the slide sorter window.
-        <p>It is not always possible to move the current slide into the
-        exact center of the window, for example when slides are located near
-        the start or end of a document.</p>
-        <p>The default value is <FALSE/>.
-    */
-    [attribute] boolean IsCenterSelection;
-
-    /** This flag controls whether updates of previews are created during
-        full screen presentations (<FALSE/>) or not (<TRUE/>).  The
-        suspension of preview creations is an optimization for not slowing
-        down a running presentation.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsSuspendPreviewUpdatesDuringFullScreenPresentation;
-
-    /** The orientation of a slide sorter can be either vertical (<TRUE/>)
-        or horizontal (<FALSE/>).
-    */
-    [attribute] boolean IsOrientationVertical;
-
-    /** This flag is a hint to make scrolling look smooth.
-    */
-    [attribute] boolean IsSmoothScrolling;
-
-    [attribute] ::com::sun::star::util::Color BackgroundColor;
-    [attribute] ::com::sun::star::util::Color TextColor;
-    [attribute] ::com::sun::star::util::Color SelectionColor;
-    [attribute] ::com::sun::star::util::Color HighlightColor;
-
-    /** This flag controls whether the model can be modified by using
-        keyboard or mouse.
-        <p>The default value is <TRUE/>.</p>
-    */
-    [attribute] boolean IsUIReadOnly;
-};
-
-
-
 
 /** A slide sorter shows previews for a set of slides, typically all slides
     in a document, and allows the selection, reordering, creation, and
diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl
index 5de574d9d955..b0f89a05cd46 100644
--- a/offapi/com/sun/star/drawing/XPresenterHelper.idl
+++ b/offapi/com/sun/star/drawing/XPresenterHelper.idl
@@ -36,15 +36,12 @@
 #ifndef __com_sun_star_awt_Rectangle_idl__
 #include <com/sun/star/awt/Rectangle.idl>
 #endif
+#ifndef __com_sun_star_drawing_CanvasFeature_idl__
+#include <com/sun/star/drawing/CanvasFeature.idl>
+#endif
 
 module com { module sun { module star { module drawing {
 
-constants CanvasFeature
-{
-    const short None = 0;
-    const short SpriteCanvas = 1;
-};
-
 /** This interface is a collection of functions that are necessary to
     implement larger parts of the presenter screen as extension.  The
     methods of this interface give access to services that can, at the
diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
index 00bb3e5a9868..43e43a962870 100644
--- a/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
+++ b/offapi/com/sun/star/drawing/XSlidePreviewCache.idl
@@ -39,28 +39,12 @@
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
 #endif
+#ifndef __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
+#include <com/sun/star/drawing/XSlidePreviewCacheListener.idl>
+#endif
 
 module com { module sun { module star { module drawing {
 
-/** Listener for asynchronous preview creations.  Called when a slide
-    preview has been created that was previously requested via a call to
-    <method>XSlidePreviewCache::getSlidePreview()</method>.  The
-    implementor may then call <method>getSlidePreview()</method> a second
-    time to get the up-to-date version of the preview.
-*/
-published interface XSlidePreviewCacheListener
-{
-    /** Called by a <interface>XSlidePreviewCache</interface> object when a
-        preview has been created for the slide with the given index.
-        @param nSlideIndex
-            The index of the slide for which a new preview has been created.
-    */
-    void notifyPreviewCreation ([in] long nSlideIndex);
-};
-
-
-
-
 /** A cache of preview bitmaps for the slides of one Impress or Draw
     document in one size.  There may be more than one cache for one
     document.  These are internally connected and for missing previews one
diff --git a/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl b/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl
new file mode 100644
index 000000000000..4ffd7e9353df
--- /dev/null
+++ b/offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl
@@ -0,0 +1,51 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
+#define __com_sun_star_drawing_XSlidePreviewCacheListener_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+module com { module sun { module star { module drawing {
+
+/** Listener for asynchronous preview creations.  Called when a slide
+    preview has been created that was previously requested via a call to
+    <method>XSlidePreviewCache::getSlidePreview()</method>.  The
+    implementor may then call <method>getSlidePreview()</method> a second
+    time to get the up-to-date version of the preview.
+*/
+published interface XSlidePreviewCacheListener
+{
+    /** Called by a <interface>XSlidePreviewCache</interface> object when a
+        preview has been created for the slide with the given index.
+        @param nSlideIndex
+            The index of the slide for which a new preview has been created.
+    */
+    void notifyPreviewCreation ([in] long nSlideIndex);
+};
+
+}; }; }; }; // ::com::sun::star::drawing
+
+#endif
diff --git a/offapi/com/sun/star/drawing/XSlideSorterBase.idl b/offapi/com/sun/star/drawing/XSlideSorterBase.idl
new file mode 100644
index 000000000000..8507a411a1de
--- /dev/null
+++ b/offapi/com/sun/star/drawing/XSlideSorterBase.idl
@@ -0,0 +1,133 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_drawing_XSlideSorterBase_idl__
+#define __com_sun_star_drawing_XSlideSorterBase_idl__
+
+#ifndef __com_sun_star_drawing_framework_XView_idl__
+#include <com/sun/star/drawing/framework/XView.idl>
+#endif
+#ifndef __com_sun_star_drawing_XDrawView_idl__
+#include <com/sun/star/drawing/XDrawView.idl>
+#endif
+#ifndef __com_sun_star_awt_XWindow_idl__
+#include <com/sun/star/awt/XWindow.idl>
+#endif
+#ifndef __com_sun_star_container_XIndexAccess_idl__
+#include <com/sun/star/container/XIndexAccess.idl>
+#endif
+#ifndef __com_sun_star_frame_XController_idl__
+#include <com/sun/star/frame/XController.idl>
+#endif
+#ifndef __com_sun_star_util_Color_idl__
+#include <com/sun/star/util/Color.idl>
+#endif
+
+module com {  module sun {  module star {  module drawing {
+
+/** This interface exists only because services do not directly support
+    multiple inheritance and attributes.
+    <p>It provides the interfaces and attributes that every object that
+    implements the <type>SlideSorter</type> service.</p>
+*/
+interface XSlideSorterBase
+{
+    /** This interface is included to mark a <type>SlideSorter</type> object
+        as view of the drawing framework and to provide a
+        <type>ResourceId</type>.
+    */
+    interface ::com::sun::star::drawing::framework::XView;
+
+    /** The <type>XDrawView</type> interface is included to provide access
+        to the current slide (especially write access).
+    */
+    interface ::com::sun::star::drawing::XDrawView;
+
+    /** The set of slides that are displayed by the implementing object.
+        <p>The default value is the set of all slides of the document for
+        which a slide sorter is created.</p>
+    */
+    [attribute] ::com::sun::star::container::XIndexAccess DocumentSlides;
+
+    /** Set this flag to <TRUE/> in order to have the current slide
+        highlighted.
+        <p>The default value is <FALSE/>.</p>
+    */
+    [attribute] boolean IsHighlightCurrentSlide;
+
+    /** Set this flag to <TRUE/> in order to visualize the selection of
+        slides (typically a bold frame around the selected slides).
+        <p>The default value is <TRUE/>.</p>
+    */
+    [attribute] boolean IsShowSelection;
+
+    /** Set this flag to <TRUE/> to visualize to where the focus is by
+        showing a dotted rectangle around the focused slide.
+        <p>The default value is <TRUE/>.</p>
+    */
+    [attribute] boolean IsShowFocus;
+
+    /** When this flag has the value <TRUE/> then every time the current
+        slide is changed the visual area is shifted so that the new current
+        slide is display in the center of the slide sorter window.
+        <p>It is not always possible to move the current slide into the
+        exact center of the window, for example when slides are located near
+        the start or end of a document.</p>
+        <p>The default value is <FALSE/>.
+    */
+    [attribute] boolean IsCenterSelection;
+
+    /** This flag controls whether updates of previews are created during
+        full screen presentations (<FALSE/>) or not (<TRUE/>).  The
+        suspension of preview creations is an optimization for not slowing
+        down a running presentation.
+        <p>The default value is <TRUE/>.</p>
+    */
+    [attribute] boolean IsSuspendPreviewUpdatesDuringFullScreenPresentation;
+
+    /** The orientation of a slide sorter can be either vertical (<TRUE/>)
+        or horizontal (<FALSE/>).
+    */
+    [attribute] boolean IsOrientationVertical;
+
+    /** This flag is a hint to make scrolling look smooth.
+    */
+    [attribute] boolean IsSmoothScrolling;
+
+    [attribute] ::com::sun::star::util::Color BackgroundColor;
+    [attribute] ::com::sun::star::util::Color TextColor;
+    [attribute] ::com::sun::star::util::Color SelectionColor;
+    [attribute] ::com::sun::star::util::Color HighlightColor;
+
+    /** This flag controls whether the model can be modified by using
+        keyboard or mouse.
+        <p>The default value is <TRUE/>.</p>
+    */
+    [attribute] boolean IsUIReadOnly;
+};
+
+
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/drawing/framework/BorderType.idl b/offapi/com/sun/star/drawing/framework/BorderType.idl
new file mode 100644
index 000000000000..ae838d8bb264
--- /dev/null
+++ b/offapi/com/sun/star/drawing/framework/BorderType.idl
@@ -0,0 +1,42 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_drawing_framework_BorderType_idl__
+#define __com_sun_star_drawing_framework_BorderType_idl__
+
+
+module com { module sun { module star { module drawing { module framework {
+
+/** See XPaneBorderPainter and its addBorder() and removeBorder() methods
+    for an explanation of the border type and its values.
+*/
+published enum BorderType
+{
+    INNER_BORDER,
+    OUTER_BORDER,
+    TOTAL_BORDER
+};
+
+}; }; }; }; }; // ::com::sun::star::drawing::framework
+
+#endif
diff --git a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
index 982c09a3769d..02e803faef73 100644
--- a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
+++ b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
@@ -33,20 +33,12 @@
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
 #endif
+#ifndef __com_sun_star_rendering_drawing_framework_BorderType_idl__
+#include <com/sun/star/drawing/framework/BorderType.idl>
+#endif
 
 module com { module sun { module star { module drawing { module framework {
 
-/** See XPaneBorderPainter and its addBorder() and removeBorder() methods
-    for an explanation of the border type and its values.
-*/
-published enum BorderType
-{
-    INNER_BORDER,
-    OUTER_BORDER,
-    TOTAL_BORDER
-};
-
-
 /** Paint the border around a rectangular region, typically a pane.
 
     <p>Calling objects have to be able to derive inner bounding boxs of the
diff --git a/offapi/com/sun/star/drawing/framework/makefile.mk b/offapi/com/sun/star/drawing/framework/makefile.mk
deleted file mode 100644
index e3eff6c48e58..000000000000
--- a/offapi/com/sun/star/drawing/framework/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=api
-
-TARGET=cssdframework
-PACKAGE=com$/sun$/star$/drawing$/framework
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=									\
-    AnchorBindingMode.idl					\
-    BasicPaneFactory.idl					\
-    BasicToolBarFactory.idl					\
-    BasicViewFactory.idl					\
-    Configuration.idl						\
-    ConfigurationChangeEvent.idl			\
-    ConfigurationController.idl				\
-    ModuleController.idl					\
-    ResourceActivationMode.idl				\
-    ResourceId.idl							\
-    TabBarButton.idl						\
-    XConfiguration.idl						\
-    XConfigurationChangeListener.idl		\
-    XConfigurationChangeRequest.idl			\
-    XConfigurationController.idl			\
-    XConfigurationControllerBroadcaster.idl	\
-    XConfigurationControllerRequestQueue.idl\
-    XControllerManager.idl					\
-    XModuleController.idl					\
-    XPane.idl								\
-    XPane2.idl								\
-    XPaneBorderPainter.idl					\
-    XRelocatableResource.idl				\
-    XResource.idl							\
-    XResourceId.idl							\
-    XResourceFactory.idl					\
-    XResourceFactoryManager.idl				\
-    XTabBar.idl								\
-    XToolBar.idl							\
-    XView.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/drawing/makefile.mk b/offapi/com/sun/star/drawing/makefile.mk
deleted file mode 100644
index 6c7a23fc747d..000000000000
--- a/offapi/com/sun/star/drawing/makefile.mk
+++ /dev/null
@@ -1,224 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdrawing
-PACKAGE=com$/sun$/star$/drawing
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleShape.idl      		\
-    AccessibleGraphicShape.idl      \
-    AccessibleOLEShape.idl      	\
-    AccessibleDrawDocumentView.idl	\
-    AccessibleSlideView.idl			\
-    AccessibleSlideViewObject.idl	\
-    AccessibleGraphControl.idl\
-    Alignment.idl\
-    AppletShape.idl\
-    Arrangement.idl\
-    Background.idl\
-    BezierPoint.idl\
-    BitmapMode.idl\
-    BitmapTable.idl\
-    BoundVolume.idl\
-    CameraGeometry.idl\
-    CaptionEscapeDirection.idl\
-    CaptionShape.idl\
-    CaptionType.idl\
-    CircleKind.idl\
-    ClosedBezierShape.idl\
-    ColorMode.idl\
-    ConnectionType.idl\
-    ConnectorProperties.idl\
-    ConnectorShape.idl\
-    ConnectorType.idl\
-    ControlShape.idl\
-    CoordinateSequence.idl\
-    CoordinateSequenceSequence.idl\
-    CustomShape.idl\
-    CustomShapeEngine.idl\
-    DashStyle.idl\
-    DashTable.idl\
-    Defaults.idl\
-    Direction3D.idl\
-    DocumentSettings.idl\
-    DoubleSequence.idl\
-    DoubleSequenceSequence.idl\
-    DrawingDocument.idl\
-    DrawingDocumentDrawView.idl\
-    DrawingDocumentFactory.idl\
-    DrawPage.idl\
-    DrawPages.idl\
-    DrawViewMode.idl\
-    EnhancedCustomShapeAdjustmentValue.idl\
-    EnhancedCustomShapeExtrusion.idl\
-    EnhancedCustomShapeGeometry.idl\
-    EnhancedCustomShapeGluePointType.idl\
-    EnhancedCustomShapeHandle.idl\
-    EnhancedCustomShapeParameter.idl\
-    EnhancedCustomShapeParameterPair.idl\
-    EnhancedCustomShapeParameterType.idl\
-    EnhancedCustomShapePath.idl\
-    EnhancedCustomShapeSegment.idl\
-    EnhancedCustomShapeSegmentCommand.idl\
-    EnhancedCustomShapeTextFrame.idl\
-    EnhancedCustomShapeTextPath.idl\
-    EnhancedCustomShapeTextPathMode.idl\
-    EllipseShape.idl\
-    EscapeDirection.idl\
-    FillProperties.idl\
-    FillStyle.idl\
-    FlagSequence.idl\
-    FlagSequenceSequence.idl\
-    GenericDrawingDocument.idl\
-    GenericDrawPage.idl\
-    GluePoint.idl\
-    GluePoint2.idl\
-    GradientTable.idl\
-    GraphicExportFilter.idl\
-    GraphicFilterRequest.idl\
-    GraphicObjectShape.idl\
-    GroupShape.idl\
-    Hatch.idl\
-    HatchStyle.idl\
-    HatchTable.idl\
-    HomogenMatrix.idl\
-    HomogenMatrix3.idl\
-    HomogenMatrix4.idl\
-    HomogenMatrixLine.idl\
-    HomogenMatrixLine3.idl\
-    HomogenMatrixLine4.idl\
-    HorizontalDimensioning.idl\
-    Layer.idl\
-    LayerManager.idl\
-    LayerType.idl\
-    LineCap.idl\
-    LineDash.idl\
-    LineEndType.idl\
-    LineJoint.idl\
-    LineProperties.idl\
-    LineShape.idl\
-    LineStyle.idl\
-    MarkerTable.idl\
-    MasterPage.idl\
-    MasterPages.idl\
-    MeasureKind.idl\
-    MeasureProperties.idl\
-    MeasureShape.idl\
-    MeasureTextHorzPos.idl\
-    MeasureTextVertPos.idl\
-    MirrorAxis.idl\
-    NormalsKind.idl\
-    OLE2Shape.idl\
-    OpenBezierShape.idl\
-    PageShape.idl\
-    PluginShape.idl\
-    PointSequence.idl\
-    PointSequenceSequence.idl\
-    PolygonFlags.idl\
-    PolygonKind.idl\
-    PolyLineShape.idl\
-    PolyPolygonBezierCoords.idl\
-    PolyPolygonBezierDescriptor.idl\
-    PolyPolygonBezierShape.idl\
-    PolyPolygonDescriptor.idl\
-    PolyPolygonShape.idl\
-    PolyPolygonShape3D.idl\
-    Position3D.idl\
-    ProjectionMode.idl\
-    RectanglePoint.idl\
-    RectangleShape.idl\
-    RotationDescriptor.idl\
-    ShadeMode.idl\
-    ShadowProperties.idl\
-    Shape.idl\
-    ShapeCollection.idl\
-    Shapes.idl\
-    SlideRenderer.idl\
-    SlideSorter.idl\
-    SnapObjectType.idl\
-    Text.idl\
-    TextAdjust.idl\
-    TextAnimationDirection.idl\
-    TextAnimationKind.idl\
-    TextFitToSizeType.idl\
-    TextHorizontalAdjust.idl\
-    TextProperties.idl\
-    TextShape.idl\
-    TextureKind.idl\
-    TextureKind2.idl\
-    TextureMode.idl\
-    TextureProjectionMode.idl\
-    TextVerticalAdjust.idl\
-    TransparencyGradientTable.idl\
-    VerticalDimensioning.idl\
-    XConnectableShape.idl\
-    XConnectorShape.idl\
-    XControlShape.idl\
-    XCustomShapeEngine.idl\
-    XCustomShapeHandle.idl\
-    XDrawPage.idl\
-    XDrawPageDuplicator.idl\
-    XDrawPageExpander.idl\
-    XDrawPages.idl\
-    XDrawPagesSupplier.idl\
-    XDrawPageSummarizer.idl\
-    XDrawPageSupplier.idl\
-    XDrawSubController.idl\
-    XDrawView.idl\
-    XEnhancedCustomShapeDefaulter.idl\
-    XGluePointsSupplier.idl\
-    XLayer.idl\
-    XLayerManager.idl\
-    XLayerSupplier.idl\
-    XMasterPagesSupplier.idl\
-    XMasterPageTarget.idl\
-    XPresenterHelper.idl\
-    XShape.idl\
-    XShapeAligner.idl\
-    XShapeArranger.idl\
-    XShapeBinder.idl\
-    XShapeCombiner.idl\
-    XShapeDescriptor.idl\
-    XShapeGroup.idl\
-    XShapeGrouper.idl\
-    XShapeMirror.idl\
-    XShapes.idl\
-    XSlidePreviewCache.idl\
-    XSlideRenderer.idl\
-    XUniversalShapeDescriptor.idl\
-    XSelectionFunction.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/embed/makefile.mk b/offapi/com/sun/star/embed/makefile.mk
deleted file mode 100644
index 3ee47ec76fdf..000000000000
--- a/offapi/com/sun/star/embed/makefile.mk
+++ /dev/null
@@ -1,116 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssembed
-PACKAGE=com$/sun$/star$/embed
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Actions.idl\
-    Aspects.idl\
-    BaseStorage.idl\
-    ElementModes.idl\
-    EmbedStates.idl\
-    EmbedVerbs.idl\
-    EmbedMapUnits.idl\
-    EmbedMisc.idl\
-    EmbedUpdateModes.idl\
-    EmbeddedObjectDescriptor.idl\
-    EntryInitModes.idl\
-    DocumentCloser.idl\
-    FileSystemStorage.idl\
-    FileSystemStorageFactory.idl\
-    InsertedObjectInfo.idl\
-    InstanceLocker.idl\
-    Storage.idl\
-    StorageStream.idl\
-    StorageFactory.idl\
-    StorageFormats.idl\
-    VerbAttributes.idl\
-    VisualRepresentation.idl\
-    VerbDescriptor.idl\
-    XActionsApproval.idl\
-    XPersistanceHolder.idl\
-    XEmbeddedObject.idl\
-    XVisualObject.idl\
-    XCommonEmbedPersist.idl\
-    XEmbedPersist.idl\
-    XLinkageSupport.idl\
-    XClassifiedObject.idl\
-    XInplaceObject.idl\
-    XEmbeddedClient.idl\
-    XEmbedObjectClipboardCreator.idl\
-    XEmbedObjectCreator.idl\
-    XEmbedObjectFactory.idl\
-    XLinkCreator.idl\
-    XLinkFactory.idl\
-    XEncryptionProtectedSource.idl\
-    XEncryptionProtectedSource2.idl\
-    XEncryptionProtectedStorage.idl\
-    XInplaceClient.idl\
-    XInsertObjectDialog.idl\
-    XWindowSupplier.idl\
-    XTransactedObject.idl\
-    XTransactionBroadcaster.idl\
-    XTransactionListener.idl\
-    XRelationshipAccess.idl\
-    XStateChangeBroadcaster.idl\
-    XStateChangeListener.idl\
-    XTransferableSupplier.idl\
-    XComponentSupplier.idl\
-    XStorage.idl\
-    XStorage2.idl\
-    XStorageRawAccess.idl\
-    XExtendedStorageStream.idl\
-    XHierarchicalStorageAccess.idl\
-    XHierarchicalStorageAccess2.idl\
-    XHatchWindowController.idl\
-    XHatchWindowFactory.idl\
-    XHatchWindow.idl\
-    XPackageStructureCreator.idl\
-    XOptimizedStorage.idl\
-    UnreachableStateException.idl\
-    UseBackupException.idl\
-    StateChangeInProgressException.idl\
-    WrongStateException.idl\
-    NoVisualAreaSizeException.idl\
-    ObjectSaveVetoException.idl\
-    InvalidStorageException.idl\
-    LinkageMisuseException.idl\
-    NeedsRunningStateException.idl\
-    StorageWrappedTargetException.idl\
-    OLESimpleStorage.idl\
-    XOLESimpleStorage.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/binding/makefile.mk b/offapi/com/sun/star/form/binding/makefile.mk
deleted file mode 100644
index 0fec1ebb2e60..000000000000
--- a/offapi/com/sun/star/form/binding/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfbinding
-PACKAGE=com$/sun$/star$/form$/binding
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XBindableValue.idl  \
-    XValueBinding.idl   \
-    ValueBinding.idl   \
-    XListEntrySink.idl   \
-    XListEntrySource.idl   \
-    XListEntryListener.idl   \
-    ListEntryEvent.idl   \
-    ListEntrySource.idl   \
-    \
-    BindableControlModel.idl   \
-    BindableIntegerValueRange.idl \
-    BindableDataAwareControlModel.idl   \
-    BindableDatabaseCheckBox.idl   \
-    BindableDatabaseComboBox.idl   \
-    BindableDatabaseDateField.idl   \
-    BindableDatabaseFormattedField.idl   \
-    BindableDatabaseListBox.idl   \
-    BindableDatabaseNumericField.idl   \
-    BindableDatabaseRadioButton.idl   \
-    BindableDatabaseTextField.idl   \
-    BindableDatabaseTimeField.idl   \
-    \
-    IncompatibleTypesException.idl   \
-    InvalidBindingStateException.idl   \
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/component/makefile.mk b/offapi/com/sun/star/form/component/makefile.mk
deleted file mode 100644
index 05078ef22f48..000000000000
--- a/offapi/com/sun/star/form/component/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfcomp
-PACKAGE=com$/sun$/star$/form$/component
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    CheckBox.idl\
-    ComboBox.idl\
-    CommandButton.idl\
-    CurrencyField.idl\
-    DatabaseCheckBox.idl\
-    DatabaseComboBox.idl\
-    DatabaseCurrencyField.idl\
-    DatabaseDateField.idl\
-    DatabaseImageControl.idl\
-    DatabaseListBox.idl\
-    DatabaseNumericField.idl\
-    DatabasePatternField.idl\
-    DatabaseRadioButton.idl\
-    DatabaseTextField.idl\
-    DatabaseFormattedField.idl\
-    DatabaseTimeField.idl\
-    DataForm.idl\
-    DateField.idl\
-    FileControl.idl\
-    FixedText.idl\
-    Form.idl\
-    GridControl.idl\
-    GroupBox.idl\
-    HiddenControl.idl\
-    HTMLForm.idl\
-    ImageButton.idl\
-    ListBox.idl\
-    NumericField.idl\
-    PatternField.idl\
-    RadioButton.idl\
-    TextField.idl\
-    FormattedField.idl\
-    TimeField.idl\
-    NavigationToolBar.idl\
-    ScrollBar.idl\
-    SpinButton.idl\
-    SubmitButton.idl\
-    RichTextControl.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/control/makefile.mk b/offapi/com/sun/star/form/control/makefile.mk
deleted file mode 100644
index e7e5ca5a6dc3..000000000000
--- a/offapi/com/sun/star/form/control/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfcontrol
-PACKAGE=com$/sun$/star$/form$/control
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        CheckBox.idl			\
-        ComboBox.idl			\
-        CommandButton.idl		\
-        CurrencyField.idl		\
-        DateField.idl			\
-        FormattedField.idl		\
-        GridControl.idl			\
-        GroupBox.idl			\
-        ImageButton.idl			\
-        ImageControl.idl		\
-        InteractionGridControl.idl	\
-        ListBox.idl				\
-        NumericField.idl		\
-        PatternField.idl		\
-        RadioButton.idl			\
-        TextField.idl			\
-        TimeField.idl           \
-        SubmitButton.idl        \
-        NavigationToolBar.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/inspection/makefile.mk b/offapi/com/sun/star/form/inspection/makefile.mk
deleted file mode 100644
index 169297e738c2..000000000000
--- a/offapi/com/sun/star/form/inspection/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfinsp
-PACKAGE=com$/sun$/star$/form$/inspection
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ButtonNavigationHandler.idl \
-    CellBindingPropertyHandler.idl \
-    DefaultFormComponentInspectorModel.idl \
-    EditPropertyHandler.idl \
-    EventHandler.idl \
-    FormComponentPropertyHandler.idl \
-    SubmissionPropertyHandler.idl \
-    XMLFormsPropertyHandler.idl \
-    XSDValidationPropertyHandler.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/makefile.mk b/offapi/com/sun/star/form/makefile.mk
deleted file mode 100644
index 5dd5ed321262..000000000000
--- a/offapi/com/sun/star/form/makefile.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssform
-PACKAGE=com$/sun$/star$/form
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    modules.idl\
-    DataAwareControlModel.idl\
-    DatabaseDeleteEvent.idl\
-    DatabaseParameterEvent.idl\
-    DataSelectionType.idl\
-    ErrorEvent.idl\
-    FormButtonType.idl\
-    FormComponent.idl\
-    FormComponents.idl\
-    FormComponentType.idl\
-    FormController.idl\
-    FormControllerDispatcher.idl\
-    FormControlModel.idl\
-    Forms.idl\
-    FormSubmitEncoding.idl\
-    FormSubmitMethod.idl\
-    ListSourceType.idl\
-    NavigationBarMode.idl\
-    PropertyBrowserController.idl\
-    TabulatorCycle.idl\
-    XApproveActionBroadcaster.idl\
-    XApproveActionListener.idl\
-    XBoundComponent.idl\
-    XBoundControl.idl\
-    XChangeBroadcaster.idl\
-    XChangeListener.idl\
-    XConfirmDeleteBroadcaster.idl\
-    XConfirmDeleteListener.idl\
-    XDatabaseParameterBroadcaster.idl\
-    XDatabaseParameterBroadcaster2.idl\
-    XDatabaseParameterListener.idl\
-    XDeleteListener.idl\
-    XErrorBroadcaster.idl\
-    XErrorListener.idl\
-    XForm.idl\
-    XFormComponent.idl\
-    XFormController.idl\
-    XFormControllerListener.idl\
-    XFormsSupplier.idl\
-    XFormsSupplier2.idl\
-    XGrid.idl\
-    XGridColumnFactory.idl\
-    XGridControl.idl\
-    XGridControlListener.idl\
-    XGridFieldDataSupplier.idl\
-    XGridPeer.idl\
-    XImageProducerSupplier.idl\
-    XInsertListener.idl\
-    XLoadListener.idl\
-    XPositioningListener.idl\
-    XReset.idl\
-    XResetListener.idl\
-    XRestoreListener.idl\
-    XSubmit.idl\
-    XSubmitListener.idl\
-    XUpdateBroadcaster.idl\
-    XUpdateListener.idl\
-    XLoadable.idl\
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/runtime/makefile.mk b/offapi/com/sun/star/form/runtime/makefile.mk
deleted file mode 100644
index 2503a4ab7527..000000000000
--- a/offapi/com/sun/star/form/runtime/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfrunt
-PACKAGE=com$/sun$/star$/form$/runtime
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    FeatureState.idl \
-    FilterEvent.idl \
-    FormFeature.idl \
-    FormOperations.idl \
-    FormController.idl \
-    XFeatureInvalidation.idl \
-    XFilterController.idl \
-    XFilterControllerListener.idl \
-    XFormController.idl \
-    XFormControllerContext.idl \
-    XFormOperations.idl \
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/submission/makefile.mk b/offapi/com/sun/star/form/submission/makefile.mk
deleted file mode 100644
index 9c54c8ae7f2b..000000000000
--- a/offapi/com/sun/star/form/submission/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfsubmission
-PACKAGE=com$/sun$/star$/form$/submission
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XSubmission.idl  \
-    XSubmissionSupplier.idl  \
-    XSubmissionVetoListener.idl  \
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/form/validation/makefile.mk b/offapi/com/sun/star/form/validation/makefile.mk
deleted file mode 100644
index 5322ce4837e0..000000000000
--- a/offapi/com/sun/star/form/validation/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfvalidation
-PACKAGE=com$/sun$/star$/form$/validation
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XValidatable.idl   \
-    XValidator.idl   \
-    XValidityConstraintListener.idl   \
-    XValidatableFormComponent.idl   \
-    XFormComponentValidityListener.idl   \
-    \
-    ValidatableControlModel.idl   \
-    ValidatableBindableControlModel.idl \
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/formula/makefile.mk b/offapi/com/sun/star/formula/makefile.mk
deleted file mode 100644
index ed80bb9280dc..000000000000
--- a/offapi/com/sun/star/formula/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssformula
-PACKAGE=com$/sun$/star$/formula
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleFormulaText.idl \
-    AccessibleFormulaView.idl \
-    SymbolDescriptor.idl \
-    FormulaProperties.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/frame/UntitledNumbersConst.idl b/offapi/com/sun/star/frame/UntitledNumbersConst.idl
new file mode 100644
index 000000000000..bea52f548e5a
--- /dev/null
+++ b/offapi/com/sun/star/frame/UntitledNumbersConst.idl
@@ -0,0 +1,35 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_frame_UntitledNumbersConst_idl__
+#define __com_sun_star_frame_UntitledNumbersConst_idl__
+
+ module com {  module sun {  module star {  module frame {
+
+constants UntitledNumbersConst
+{
+    const long INVALID_NUMBER = 0;
+};
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/frame/XUntitledNumbers.idl b/offapi/com/sun/star/frame/XUntitledNumbers.idl
index 0f47e760a838..267bba8ada80 100644
--- a/offapi/com/sun/star/frame/XUntitledNumbers.idl
+++ b/offapi/com/sun/star/frame/XUntitledNumbers.idl
@@ -35,11 +35,6 @@
 
  module com {  module sun {  module star {  module frame {
 
-constants UntitledNumbersConst
-{
-    const long INVALID_NUMBER = 0;
-};
-
 //=============================================================================
 /** knows all currently used and all free numbers for using with untitled
     but counted objects.
diff --git a/offapi/com/sun/star/frame/status/makefile.mk b/offapi/com/sun/star/frame/status/makefile.mk
deleted file mode 100644
index 39c4bb478744..000000000000
--- a/offapi/com/sun/star/frame/status/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfstatus
-PACKAGE=com$/sun$/star$/frame$/status
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    FontHeight.idl              \
-    Verb.idl                    \
-    ClipboardFormats.idl        \
-    LeftRightMargin.idl         \
-    UpperLowerMargin.idl        \
-    UpperLowerMarginScale.idl   \
-    Template.idl                \
-    ItemStatus.idl              \
-    ItemState.idl               \
-    Visibility.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/gallery/makefile.mk b/offapi/com/sun/star/gallery/makefile.mk
deleted file mode 100644
index e4c678ec978a..000000000000
--- a/offapi/com/sun/star/gallery/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-PRJNAME=offapi
-TARGET=cssgallery
-PACKAGE=com$/sun$/star$/gallery
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    GalleryThemeProvider.idl   	\
-    GalleryTheme.idl   			\
-    GalleryItem.idl   			\
-    GalleryItemType.idl 		\
-    XGalleryThemeProvider.idl	\
-    XGalleryTheme.idl  			\
-    XGalleryItem.idl  	
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/geometry/makefile.mk b/offapi/com/sun/star/geometry/makefile.mk
deleted file mode 100644
index b60f90f7b373..000000000000
--- a/offapi/com/sun/star/geometry/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssgeometry
-PACKAGE=com$/sun$/star$/geometry
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AffineMatrix2D.idl			\
-    AffineMatrix3D.idl			\
-    EllipticalArc.idl			\
-    Matrix2D.idl				\
-    XMapping2D.idl				\
-    IntegerBezierSegment2D.idl 	\
-    RealBezierSegment2D.idl 	\
-    RealPoint2D.idl				\
-    RealRectangle2D.idl			\
-    RealRectangle3D.idl			\
-    RealSize2D.idl				\
-    IntegerPoint2D.idl			\
-    IntegerRectangle2D.idl		\
-    IntegerSize2D.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/graphic/makefile.mk b/offapi/com/sun/star/graphic/makefile.mk
deleted file mode 100644
index 59321c62784f..000000000000
--- a/offapi/com/sun/star/graphic/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-TARGET=cssgraphic
-PACKAGE=com$/sun$/star$/graphic
-
-PRJNAME=offapi
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-#-------------------------------------------------------------------
-
-IDLFILES= \
-    Graphic.idl \
-    GraphicColorMode.idl \
-    GraphicDescriptor.idl \
-    GraphicObject.idl \
-    GraphicProvider.idl \
-    GraphicRasterizer.idl \
-    GraphicRendererVCL.idl \
-    GraphicType.idl \
-    MediaProperties.idl \
-    Primitive2DTools.idl \
-    SvgTools.idl \
-    XPrimitive2D.idl \
-    XPrimitive3D.idl \
-    XPrimitiveFactory2D.idl \
-    XGraphic.idl \
-    XGraphicProvider.idl \
-    XGraphicRasterizer.idl \
-    XGraphicRenderer.idl \
-    XGraphicObject.idl \
-    XGraphicTransformer.idl \
-    XPrimitive2DRenderer.idl \
-    XSvgParser.idl
-    
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/i18n/makefile.mk b/offapi/com/sun/star/i18n/makefile.mk
deleted file mode 100644
index 4d082e2b855a..000000000000
--- a/offapi/com/sun/star/i18n/makefile.mk
+++ /dev/null
@@ -1,125 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssi18n
-PACKAGE=com$/sun$/star$/i18n
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AmPmValue.idl \
-    Boundary.idl \
-    BreakIterator.idl \
-    BreakType.idl \
-    CTLScriptType.idl \
-    Calendar.idl \
-    CalendarDisplayCode.idl \
-    CalendarDisplayIndex.idl \
-    CalendarFieldIndex.idl \
-    CalendarItem.idl \
-    ChapterCollator.idl \
-    CharType.idl \
-    CharacterClassification.idl \
-    CharacterIteratorMode.idl \
-    Collator.idl \
-    CollatorOptions.idl \
-    Currency.idl \
-    Currency2.idl \
-    DirectionProperty.idl \
-    ForbiddenCharacters.idl \
-    FormatElement.idl \
-    Implementation.idl \
-    IndexEntrySupplier.idl \
-    InputSequenceChecker.idl \
-    InputSequenceCheckMode.idl \
-    KCharacterType.idl \
-    KNumberFormatType.idl \
-    KNumberFormatUsage.idl \
-    KParseTokens.idl \
-    KParseType.idl \
-    LanguageCountryInfo.idl \
-    LineBreakHyphenationOptions.idl  \
-    LineBreakResults.idl \
-    LineBreakUserOptions.idl  \
-    LocaleCalendar.idl \
-    LocaleData.idl \
-    LocaleDataItem.idl \
-    LocaleItem.idl \
-    Months.idl \
-    MultipleCharsOutputException.idl \
-    NativeNumberMode.idl \
-    NativeNumberSupplier.idl \
-    NativeNumberXmlAttributes.idl \
-    NumberFormatCode.idl \
-    NumberFormatIndex.idl \
-    NumberFormatMapper.idl \
-    ParseResult.idl \
-    ScriptDirection.idl \
-    ScriptType.idl \
-    TextConversion.idl \
-    TextConversionOption.idl \
-    TextConversionResult.idl \
-    TextConversionType.idl \
-    Transliteration.idl \
-    TransliterationModules.idl \
-    TransliterationModulesNew.idl \
-    TransliterationModulesExtra.idl \
-    TransliterationType.idl \
-    UnicodeScript.idl \
-    UnicodeType.idl \
-    Weekdays.idl \
-    WordType.idl \
-    XBreakIterator.idl \
-    XCalendar.idl \
-    XCharacterClassification.idl \
-    XCollator.idl \
-    XExtendedCalendar.idl \
-    XExtendedIndexEntrySupplier.idl \
-    XExtendedTransliteration.idl \
-    XForbiddenCharacters.idl \
-    XIndexEntrySupplier.idl \
-    XInputSequenceChecker.idl \
-    XExtendedInputSequenceChecker.idl \
-    XLocaleData.idl \
-    XLocaleData2.idl \
-    XNativeNumberSupplier.idl \
-    XNumberFormatCode.idl \
-    XTextConversion.idl \
-    XExtendedTextConversion.idl \
-    XScriptTypeDetector.idl \
-    XTransliteration.idl \
-    reservedWords.idl \
-    XOrdinalSuffix.idl \
-    OrdinalSuffix.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/image/makefile.mk b/offapi/com/sun/star/image/makefile.mk
deleted file mode 100644
index 0163fb6006c1..000000000000
--- a/offapi/com/sun/star/image/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssimage
-PACKAGE=com$/sun$/star$/image
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ImageMap.idl\
-    ImageMapObject.idl\
-    ImageMapRectangleObject.idl\
-    ImageMapCircleObject.idl\
-    ImageMapPolygonObject.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/inspection/StringRepresentation.idl b/offapi/com/sun/star/inspection/StringRepresentation.idl
new file mode 100644
index 000000000000..11bce509de5d
--- /dev/null
+++ b/offapi/com/sun/star/inspection/StringRepresentation.idl
@@ -0,0 +1,43 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_inspection_StringRepresentation_idl__
+#define __com_sun_star_inspection_StringRepresentation_idl__
+
+#include <com/sun/star/inspection/XStringRepresentation.idl>
+
+//=============================================================================
+module com {  module sun {  module star {  module inspection {
+
+//-----------------------------------------------------------------------------
+service StringRepresentation : XStringRepresentation
+{
+    create([in]com::sun::star::script::XTypeConverter TypeConverter)raises( com::sun::star::lang::IllegalArgumentException );
+    createConstant([in]com::sun::star::script::XTypeConverter TypeConverter,[in] string Constant,[in] sequence<string> Values)raises( com::sun::star::lang::IllegalArgumentException );
+};
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/inspection/XStringRepresentation.idl b/offapi/com/sun/star/inspection/XStringRepresentation.idl
index a3eb32c017a6..1f026a8cff5a 100644
--- a/offapi/com/sun/star/inspection/XStringRepresentation.idl
+++ b/offapi/com/sun/star/inspection/XStringRepresentation.idl
@@ -59,11 +59,6 @@ published interface XStringRepresentation
                         ) raises( com::sun::star::uno::Exception );
 };
 
-service StringRepresentation : XStringRepresentation
-{
-    create([in]com::sun::star::script::XTypeConverter TypeConverter)raises( com::sun::star::lang::IllegalArgumentException );
-    createConstant([in]com::sun::star::script::XTypeConverter TypeConverter,[in] string Constant,[in] sequence<string> Values)raises( com::sun::star::lang::IllegalArgumentException );
-};
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/inspection/makefile.mk b/offapi/com/sun/star/inspection/makefile.mk
deleted file mode 100644
index 3daa75c4b977..000000000000
--- a/offapi/com/sun/star/inspection/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssinspection
-PACKAGE=com$/sun$/star$/inspection
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    DefaultHelpProvider.idl \
-    GenericPropertyHandler.idl \
-    InteractiveSelectionResult.idl \
-    LineDescriptor.idl \
-    ObjectInspector.idl \
-    ObjectInspectorModel.idl \
-    PropertyCategoryDescriptor.idl \
-    PropertyControlType.idl \
-    PropertyLineElement.idl \
-    XHyperlinkControl.idl \
-    XNumericControl.idl \
-    XObjectInspector.idl \
-    XObjectInspectorModel.idl \
-    XObjectInspectorUI.idl \
-    XPropertyControl.idl \
-    XPropertyControlContext.idl \
-    XPropertyControlFactory.idl \
-    XPropertyControlObserver.idl \
-    XPropertyHandler.idl \
-    XStringListControl.idl \
-    XStringRepresentation.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/installation/makefile.mk b/offapi/com/sun/star/installation/makefile.mk
deleted file mode 100644
index 2ac6c521d51c..000000000000
--- a/offapi/com/sun/star/installation/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssinstallation
-PACKAGE=com$/sun$/star$/installation
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    InstallationCheck.idl\
-    InstallationCheckService.idl\
-    InternetSettings.idl\
-    ProtDlgRes.idl\
-    ProtocolHandlerCheck.idl\
-    ProtocolHandlerCheckService.idl\
-    protocols.idl\
-    XInstallationCheck.idl\
-    XProtocolHandlerCheck.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/ldap/makefile.mk b/offapi/com/sun/star/ldap/makefile.mk
deleted file mode 100644
index 3f5b91a343b8..000000000000
--- a/offapi/com/sun/star/ldap/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssldap
-PACKAGE=com$/sun$/star$/ldap
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    LdapGenericException.idl\
-    LdapConnectionException.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/linguistic2/makefile.mk b/offapi/com/sun/star/linguistic2/makefile.mk
deleted file mode 100644
index 727fbbff0b7c..000000000000
--- a/offapi/com/sun/star/linguistic2/makefile.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csslinguistic2
-PACKAGE=com$/sun$/star$/linguistic2
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ConversionDictionary.idl \
-    ConversionDictionaryList.idl \
-    ConversionDictionaryType.idl \
-    ConversionDirection.idl \
-    ConversionPropertyType.idl \
-    Dictionary.idl\
-    DictionaryEvent.idl\
-    DictionaryEventFlags.idl\
-    DictionaryList.idl\
-    DictionaryListEvent.idl\
-    DictionaryListEventFlags.idl\
-    DictionaryType.idl\
-    HangulHanjaConversionDictionary.idl \
-    Hyphenator.idl\
-    LinguProperties.idl\
-    LinguServiceEvent.idl\
-    LinguServiceEventFlags.idl\
-    LinguServiceManager.idl\
-    SpellChecker.idl\
-    SpellFailure.idl\
-    Thesaurus.idl\
-    XAvailableLocales.idl\
-    XConversionDictionary.idl \
-    XConversionDictionaryList.idl \
-    XConversionPropertyType.idl \
-    XDictionary.idl\
-    XDictionary1.idl\
-    XDictionaryEntry.idl\
-    XDictionaryEventListener.idl\
-    XDictionaryList.idl\
-    XDictionaryListEventListener.idl\
-    XHyphenatedWord.idl\
-    XHyphenator.idl\
-    XLanguageGuessing.idl\
-    XLinguServiceEventBroadcaster.idl\
-    XLinguServiceEventListener.idl\
-    XLinguServiceManager.idl\
-    XMeaning.idl\
-    XPossibleHyphens.idl\
-    XSearchableDictionary.idl\
-    XSearchableDictionaryList.idl\
-    XSpellAlternatives.idl\
-    XSetSpellAlternatives.idl\
-    XSpellChecker.idl\
-    XSpellChecker1.idl\
-    XSupportedLanguages.idl\
-    XSupportedLocales.idl\
-    XThesaurus.idl\
-    SingleProofreadingError.idl\
-    ProofreadingResult.idl\
-    Proofreader.idl\
-    XProofreader.idl\
-    XProofreadingIterator.idl\
-    ProofreadingIterator.idl
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :	target.mk
-.INCLUDE :	$(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/logging/makefile.mk b/offapi/com/sun/star/logging/makefile.mk
deleted file mode 100644
index 0e79ba5fc771..000000000000
--- a/offapi/com/sun/star/logging/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ := ..$/..$/..$/..
-PRJNAME := offapi
-TARGET := csslogging
-
-PACKAGE := com$/sun$/star$/logging
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    ConsoleHandler.idl\
-    CsvLogFormatter.idl\
-    DocumentIOLogRing.idl\
-    FileHandler.idl\
-    LoggerPool.idl\
-    LogLevel.idl\
-    LogRecord.idl\
-    PlainTextFormatter.idl\
-    SimpleLogRing.idl\
-    XConsoleHandler.idl\
-    XCsvLogFormatter.idl\
-    XLogFormatter.idl\
-    XLogger.idl\
-    XLoggerPool.idl\
-    XLogHandler.idl\
-    XSimpleLogRing.idl
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/mail/makefile.mk b/offapi/com/sun/star/mail/makefile.mk
deleted file mode 100644
index 91e7d8824a2b..000000000000
--- a/offapi/com/sun/star/mail/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssmail
-PACKAGE=com$/sun$/star$/mail
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    MailException.idl\
-    SendMailMessageFailedException.idl\
-    NoMailServiceProviderException.idl\
-    XMailService.idl\
-    XAuthenticator.idl\
-    XMailMessage.idl\
-    MailMessage.idl\
-    XConnectionListener.idl\
-    MailAttachment.idl\
-    XSmtpService.idl\
-    MailServiceType.idl\
-    XMailServiceProvider.idl\
-    MailServiceProvider.idl
-    
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/makefile.mk b/offapi/com/sun/star/makefile.mk
deleted file mode 100644
index 79eda3710ced..000000000000
--- a/offapi/com/sun/star/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=css
-PACKAGE=com$/sun$/star
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    modules.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/media/makefile.mk b/offapi/com/sun/star/media/makefile.mk
deleted file mode 100644
index 902d3163a497..000000000000
--- a/offapi/com/sun/star/media/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-PRJNAME=offapi
-TARGET=cssmedia
-PACKAGE=com$/sun$/star$/media
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Manager.idl         \
-    XManager.idl        \
-    XFrameGrabber.idl   \
-    XPlayer.idl         \
-    XPlayerWindow.idl   \
-    ZoomLevel.idl       
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/mozilla/makefile.mk b/offapi/com/sun/star/mozilla/makefile.mk
deleted file mode 100644
index a236282b2d5a..000000000000
--- a/offapi/com/sun/star/mozilla/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssmozilla
-PACKAGE=com$/sun$/star$/mozilla
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    MenuMultipleChange.idl \
-    MenuSingleChange.idl \
-    MenuProxy.idl \
-    MenuProxyListener.idl \
-    XMenuProxy.idl \
-    XMenuProxyListener.idl \
-    XPluginInstance.idl \
-    XPluginInstanceNotifySink.idl \
-    XPluginInstancePeer.idl \
-    XPluginInstanceSyncPeer.idl \
-    XPluginWindowPeer.idl \
-    XCloseSessionListener.idl \
-    XRemoteServiceManagerProvider.idl	\
-    MozillaBootstrap.idl \
-    MozillaProductType.idl	\
-    XMozillaBootstrap.idl \
-    XProfileDiscover.idl	\
-    XProfileManager.idl	\
-    XProxyRunner.idl	\
-    XCodeProxy.idl
-
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/office/makefile.mk b/offapi/com/sun/star/office/makefile.mk
deleted file mode 100644
index 2810c89804e2..000000000000
--- a/offapi/com/sun/star/office/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-PRJNAME=offapi
-TARGET=cssoffice
-PACKAGE=com$/sun$/star$/office
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XAnnotation.idl\
-    XAnnotationEnumeration.idl\
-    XAnnotationAccess.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/oooimprovement/makefile.mk b/offapi/com/sun/star/oooimprovement/makefile.mk
deleted file mode 100644
index 774f37a79699..000000000000
--- a/offapi/com/sun/star/oooimprovement/makefile.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ := ..$/..$/..$/..
-PRJNAME := offapi
-TARGET := cssoooimprovement
-
-PACKAGE := com$/sun$/star$/oooimprovement
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    Core.idl \
-    CoreController.idl \
-    XCore.idl \
-    XCoreController.idl \
-
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/packages/makefile.mk b/offapi/com/sun/star/packages/makefile.mk
deleted file mode 100644
index a7f69b85b66e..000000000000
--- a/offapi/com/sun/star/packages/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csspackages
-PACKAGE=com$/sun$/star$/packages
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        Package.idl\
-        PackageFolder.idl\
-        PackageFolderEnumeration.idl\
-        PackageStream.idl\
-        EncryptionNotAllowedException.idl\
-        NoEncryptionException.idl\
-        WrongPasswordException.idl\
-        NoRawFormatException.idl\
-        XDataSinkEncrSupport.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/packages/manifest/makefile.mk b/offapi/com/sun/star/packages/manifest/makefile.mk
deleted file mode 100644
index 27817f3790dc..000000000000
--- a/offapi/com/sun/star/packages/manifest/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssmanifest
-PACKAGE=com$/sun$/star$/packages$/manifest
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        XManifestReader.idl\
-        XManifestWriter.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/packages/zip/makefile.mk b/offapi/com/sun/star/packages/zip/makefile.mk
deleted file mode 100644
index 6239e48db3a0..000000000000
--- a/offapi/com/sun/star/packages/zip/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csszippackage
-PACKAGE=com$/sun$/star$/packages
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        ZipEntry.idl\
-        ZipException.idl \
-        ZipIOException.idl \
-        ZipConstants.idl\
-        ZipFileAccess.idl\
-        XZipFileAccess.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/plugin/makefile.mk b/offapi/com/sun/star/plugin/makefile.mk
deleted file mode 100644
index 475481f4cc00..000000000000
--- a/offapi/com/sun/star/plugin/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssplugin
-PACKAGE=com$/sun$/star$/plugin
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    PluginDescription.idl\
-    PluginException.idl\
-    PluginManager.idl\
-    PluginMode.idl\
-    PluginVariable.idl\
-    XPlugin.idl\
-    XPluginContext.idl\
-    XPluginManager.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/presentation/SlideShow.idl b/offapi/com/sun/star/presentation/SlideShow.idl
new file mode 100644
index 000000000000..49967b146342
--- /dev/null
+++ b/offapi/com/sun/star/presentation/SlideShow.idl
@@ -0,0 +1,35 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef _com_sun_star_presentation_SlideShow_idl
+#define _com_sun_star_presentation_SlideShow_idl
+
+#include <com/sun/star/presentation/XSlideShow.idl>
+
+module com {  module sun {  module star {  module presentation {
+
+service SlideShow : XSlideShow;
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/presentation/TransitionFactory.idl b/offapi/com/sun/star/presentation/TransitionFactory.idl
new file mode 100644
index 000000000000..48335229dbe1
--- /dev/null
+++ b/offapi/com/sun/star/presentation/TransitionFactory.idl
@@ -0,0 +1,36 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_presentation_TransitionFactory_idl__
+#define __com_sun_star_presentation_TransitionFactory_idl__
+
+#include <com/sun/star/presentation/XTransitionFactory.idl>
+
+
+module com {  module sun {  module star { module presentation {
+
+service TransitionFactory : XTransitionFactory;
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl
index 40fda413f719..eef993fe7967 100644
--- a/offapi/com/sun/star/presentation/XSlideShow.idl
+++ b/offapi/com/sun/star/presentation/XSlideShow.idl
@@ -365,8 +365,6 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
 
 };
 
-service SlideShow : XSlideShow;
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/presentation/XTransitionFactory.idl b/offapi/com/sun/star/presentation/XTransitionFactory.idl
index 2ce3f5fce3f4..da7ab62346ff 100644
--- a/offapi/com/sun/star/presentation/XTransitionFactory.idl
+++ b/offapi/com/sun/star/presentation/XTransitionFactory.idl
@@ -80,8 +80,6 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
                                   [in] com::sun::star::rendering::XBitmap    enteringBitmap );
 };
 
-service TransitionFactory : XTransitionFactory;
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/presentation/makefile.mk b/offapi/com/sun/star/presentation/makefile.mk
deleted file mode 100644
index 96170e973c26..000000000000
--- a/offapi/com/sun/star/presentation/makefile.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csspresentation
-PACKAGE=com$/sun$/star$/presentation
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    HeaderShape.idl\
-    FooterShape.idl\
-    DateTimeShape.idl\
-    SlideNumberShape.idl\
-    AnimationEffect.idl\
-    AnimationSpeed.idl\
-    ChartShape.idl\
-    ClickAction.idl\
-    CustomPresentation.idl\
-    CustomPresentationAccess.idl\
-    DocumentSettings.idl\
-    DrawPage.idl\
-    FadeEffect.idl\
-    GraphicObjectShape.idl\
-    HandoutShape.idl\
-    HandoutView.idl\
-    NotesShape.idl\
-    NotesView.idl\
-    OLE2Shape.idl\
-    OutlinerShape.idl\
-    OutlineView.idl\
-    PageShape.idl\
-    Presentation.idl\
-    Presentation2.idl\
-    PresentationDocument.idl\
-    PresentationRange.idl\
-    PresentationView.idl\
-    PreviewView.idl\
-    Shape.idl\
-    SlidesView.idl\
-    SubtitleShape.idl\
-    TitleTextShape.idl\
-    XCustomPresentationSupplier.idl\
-    XHandoutMasterSupplier.idl\
-    XPresentation.idl\
-    XPresentationPage.idl\
-    XPresentationSupplier.idl\
-    EffectNodeType.idl\
-    EffectPresetClass.idl\
-    ParagraphTarget.idl\
-    ShapeAnimationSubType.idl\
-    TextAnimationType.idl\
-    EffectCommands.idl\
-    XShapeEventListener.idl\
-    XSlideShow.idl\
-    XSlideShowController.idl\
-    XSlideShowListener.idl\
-    XSlideShowView.idl\
-    XPresentation2.idl\
-    XTransition.idl\
-    XTransitionFactory.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/presentation/textfield/makefile.mk b/offapi/com/sun/star/presentation/textfield/makefile.mk
deleted file mode 100644
index 075237b59a00..000000000000
--- a/offapi/com/sun/star/presentation/textfield/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csspresentationtextfield
-PACKAGE=com$/sun$/star$/presentation$/textfield
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Header.idl\
-    Footer.idl\
-    DateTime.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/rdf/makefile.mk b/offapi/com/sun/star/rdf/makefile.mk
deleted file mode 100644
index 0e0c117eb1fd..000000000000
--- a/offapi/com/sun/star/rdf/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssrdf
-PACKAGE=com$/sun$/star$/rdf
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES= \
-    FileFormat.idl \
-    URIs.idl \
-    ParseException.idl \
-    QueryException.idl \
-    RepositoryException.idl \
-    XNode.idl \
-    XResource.idl \
-    XBlankNode.idl \
-    XURI.idl \
-    XLiteral.idl \
-    BlankNode.idl \
-    URI.idl \
-    Literal.idl \
-    Statement.idl \
-    XReifiedStatement.idl \
-    XQuerySelectResult.idl \
-    XNamedGraph.idl \
-    XRepository.idl \
-    XDocumentRepository.idl \
-    Repository.idl \
-    XRepositorySupplier.idl \
-    XMetadatable.idl \
-    XDocumentMetadataAccess.idl \
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/rendering/ARGBColor.idl b/offapi/com/sun/star/rendering/ARGBColor.idl
new file mode 100644
index 000000000000..1f81369e8abf
--- /dev/null
+++ b/offapi/com/sun/star/rendering/ARGBColor.idl
@@ -0,0 +1,51 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_rendering_ARGBColor_idl__
+#define __com_sun_star_rendering_ARGBColor_idl__
+
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#include <com/sun/star/rendering/ColorComponent.idl>
+#endif
+
+module com { module sun { module star { module rendering {
+
+/// ARGB color quad
+published struct ARGBColor
+{
+    /** Alpha component.<p>
+
+        Valid range is [0,1.0], with 0.0 denoting fully transparent,
+        and 1.0 fully opaque.
+     */
+    ColorComponent Alpha;
+    /// Red component. Valid range is [0,1.0]
+    ColorComponent Red;
+    /// Green component. Valid range is [0,1.0]
+    ColorComponent Green;
+    /// Blue component. Valid range is [0,1.0]
+    ColorComponent Blue;
+};
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/rendering/BitmapCanvas.idl b/offapi/com/sun/star/rendering/BitmapCanvas.idl
new file mode 100644
index 000000000000..452e3242fabe
--- /dev/null
+++ b/offapi/com/sun/star/rendering/BitmapCanvas.idl
@@ -0,0 +1,53 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_rendering_BitmapCanvas_idl__
+#define __com_sun_star_rendering_BitmapCanvas_idl__
+
+#ifndef __com_sun_star_rendering_XBitmap_idl__
+#include <com/sun/star/rendering/XBitmap.idl>
+#endif
+#ifndef __com_sun_star_rendering_XBitmapCanvas_idl__
+#include <com/sun/star/rendering/XBitmapCanvas.idl>
+#endif
+
+
+module com { module sun { module star { module rendering {
+
+// TODO: Multiple-inheritance interfaces
+
+/** This service provides the interfaces for a <type>XBitmapCanvas</type>
+ */
+service BitmapCanvas
+{
+    /** Canvas interface, to issue rendering operations.
+     */
+    interface XBitmapCanvas;
+
+    /** Bitmap interface, to directly manipulate the pixel.
+     */
+    interface XBitmap;
+};
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/rendering/Canvas.idl b/offapi/com/sun/star/rendering/Canvas.idl
new file mode 100644
index 000000000000..1e694ef29b45
--- /dev/null
+++ b/offapi/com/sun/star/rendering/Canvas.idl
@@ -0,0 +1,38 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_rendering_Canvas_idl__
+#define __com_sun_star_rendering_Canvas_idl__
+
+#ifndef __com_sun_star_rendering_XCanvas_idl__
+#include <com/sun/star/rendering/XCanvas.idl>
+#endif
+
+
+module com { module sun { module star { module rendering {
+
+/// Service providing an <type>XCanvas</type> interface
+service Canvas: XCanvas;
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/rendering/Color.idl b/offapi/com/sun/star/rendering/Color.idl
new file mode 100644
index 000000000000..cf997fdf2326
--- /dev/null
+++ b/offapi/com/sun/star/rendering/Color.idl
@@ -0,0 +1,37 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_rendering_Color_idl__
+#define __com_sun_star_rendering_Color_idl__
+
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#include <com/sun/star/rendering/ColorComponent.idl>
+#endif
+
+module com { module sun { module star { module rendering {
+
+/// Shorthand for the device-dependent color components, and easier to read
+published typedef sequence<ColorComponent> Color;
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/rendering/ColorComponent.idl b/offapi/com/sun/star/rendering/ColorComponent.idl
new file mode 100644
index 000000000000..7c47a0f934ad
--- /dev/null
+++ b/offapi/com/sun/star/rendering/ColorComponent.idl
@@ -0,0 +1,34 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#define __com_sun_star_rendering_ColorComponent_idl__
+
+module com { module sun { module star { module rendering {
+
+/// Shorthand for the device-dependent color components, and easier to read
+published typedef double ColorComponent;
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/rendering/RGBColor.idl b/offapi/com/sun/star/rendering/RGBColor.idl
new file mode 100644
index 000000000000..d623b58b557c
--- /dev/null
+++ b/offapi/com/sun/star/rendering/RGBColor.idl
@@ -0,0 +1,45 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_rendering_RGBColor_idl__
+#define __com_sun_star_rendering_RGBColor_idl__
+
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#include <com/sun/star/rendering/ColorComponent.idl>
+#endif
+
+module com { module sun { module star { module rendering {
+
+/// RGB color triplet
+published struct RGBColor
+{
+    /// Red component. Valid range is [0,1.0]
+    ColorComponent Red;
+    /// Green component. Valid range is [0,1.0]
+    ColorComponent Green;
+    /// Blue component. Valid range is [0,1.0]
+    ColorComponent Blue;
+};
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/rendering/XBitmapCanvas.idl b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
index b502b1daaf86..403c64ce0ccc 100644
--- a/offapi/com/sun/star/rendering/XBitmapCanvas.idl
+++ b/offapi/com/sun/star/rendering/XBitmapCanvas.idl
@@ -35,9 +35,6 @@
 #ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
 #endif
-#ifndef __com_sun_star_rendering_XBitmap_idl__
-#include <com/sun/star/rendering/XBitmap.idl>
-#endif
 #ifndef __com_sun_star_rendering_XCanvas_idl__
 #include <com/sun/star/rendering/XCanvas.idl>
 #endif
@@ -125,23 +122,6 @@ published interface XBitmapCanvas : XCanvas
 
 };
 
-//=============================================================================
-
-// TODO: Multiple-inheritance interfaces
-
-/** This service provides the interfaces for a <type>XBitmapCanvas</type>
- */
-service BitmapCanvas
-{
-    /** Canvas interface, to issue rendering operations.
-     */
-    interface XBitmapCanvas;
-
-    /** Bitmap interface, to directly manipulate the pixel.
-     */
-    interface XBitmap;
-};
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/rendering/XCanvas.idl b/offapi/com/sun/star/rendering/XCanvas.idl
index 029d3aad8767..326e5c9fdb61 100644
--- a/offapi/com/sun/star/rendering/XCanvas.idl
+++ b/offapi/com/sun/star/rendering/XCanvas.idl
@@ -730,11 +730,6 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
     XGraphicDevice          getDevice();
 };
 
-//=============================================================================
-
-/// Service providing an <type>XCanvas</type> interface
-service Canvas: XCanvas;
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/rendering/XColorSpace.idl b/offapi/com/sun/star/rendering/XColorSpace.idl
index 1be44020fbd7..e7ff6628e9be 100644
--- a/offapi/com/sun/star/rendering/XColorSpace.idl
+++ b/offapi/com/sun/star/rendering/XColorSpace.idl
@@ -35,47 +35,18 @@
 #ifndef __com_sun_star_rendering_ColorProfile_idl__
 #include <com/sun/star/rendering/ColorProfile.idl>
 #endif
+#ifndef __com_sun_star_rendering_ColorComponent_idl__
+#include <com/sun/star/rendering/ColorComponent.idl>
+#endif
+#ifndef __com_sun_star_rendering_RGBColor_idl__
+#include <com/sun/star/rendering/RGBColor.idl>
+#endif
+#ifndef __com_sun_star_rendering_ARGBColor_idl__
+#include <com/sun/star/rendering/ARGBColor.idl>
+#endif
 
 module com { module sun { module star { module rendering {
 
-/// Shorthand for the device-dependent color components, and easier to read
-published typedef double ColorComponent;
-published typedef sequence<ColorComponent> Color;
-
-//=============================================================================
-
-/// RGB color triplet
-published struct RGBColor
-{
-    /// Red component. Valid range is [0,1.0]
-    ColorComponent Red;
-    /// Green component. Valid range is [0,1.0]
-    ColorComponent Green;
-    /// Blue component. Valid range is [0,1.0]
-    ColorComponent Blue;
-};
-
-//=============================================================================
-
-/// ARGB color quad
-published struct ARGBColor
-{
-    /** Alpha component.<p>
-
-        Valid range is [0,1.0], with 0.0 denoting fully transparent,
-        and 1.0 fully opaque.
-     */
-    ColorComponent Alpha;
-    /// Red component. Valid range is [0,1.0]
-    ColorComponent Red;
-    /// Green component. Valid range is [0,1.0]
-    ColorComponent Green;
-    /// Blue component. Valid range is [0,1.0]
-    ColorComponent Blue;
-};
-
-//=============================================================================
-
 /** Information how to interpret certain color data.<p>
 
     This interface encapsulates all information that is necessary to
diff --git a/offapi/com/sun/star/rendering/makefile.mk b/offapi/com/sun/star/rendering/makefile.mk
deleted file mode 100644
index 89edfa1d59e0..000000000000
--- a/offapi/com/sun/star/rendering/makefile.mk
+++ /dev/null
@@ -1,113 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssrendering
-PACKAGE=com$/sun$/star$/rendering
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AnimationAttributes.idl \
-    AnimationRepeat.idl \
-    BlendMode.idl \
-    CanvasFactory.idl \
-    Caret.idl \
-    ColorComponentTag.idl \
-    ColorProfile.idl \
-    ColorSpaceType.idl \
-    CompositeOperation.idl \
-    EmphasisMark.idl \
-    FillRule.idl \
-    FloatingPointBitmapFormat.idl \
-    FloatingPointBitmapLayout.idl \
-    FontInfo.idl \
-    FontMetrics.idl \
-    FontRequest.idl \
-    IntegerBitmapLayout.idl \
-    InterpolationMode.idl \
-    Panose.idl \
-    PanoseArmStyle.idl \
-    PanoseContrast.idl \
-    PanoseFamilyTypes.idl \
-    PanoseLetterForm.idl \
-    PanoseMidline.idl \
-    PanoseProportion.idl \
-    PanoseSerifStyle.idl \
-    PanoseStrokeVariation.idl \
-    PanoseWeight.idl \
-    PanoseXHeight.idl \
-    PathCapType.idl \
-    PathJoinType.idl \
-    RenderState.idl \
-    RenderingIntent.idl \
-    RepaintResult.idl \
-    StringContext.idl \
-    StrokeAttributes.idl \
-    TextDirection.idl \
-    TextHit.idl \
-    Texture.idl \
-    TexturingMode.idl \
-    ViewState.idl \
-    VolatileContentDestroyedException.idl \
-    XAnimatedSprite.idl \
-    XAnimation.idl \
-    XBezierPolyPolygon2D.idl \
-    XBitmap.idl \
-    XBitmapCanvas.idl \
-    XBitmapPalette.idl \
-    XBufferController.idl \
-    XCachedPrimitive.idl \
-    XCanvas.idl \
-    XCanvasFont.idl \
-    XColorSpace.idl \
-    XCustomSprite.idl \
-    XGraphicDevice.idl \
-    XHalfFloatBitmap.idl \
-    XHalfFloatReadOnlyBitmap.idl \
-    XIeeeDoubleBitmap.idl \
-    XIeeeDoubleReadOnlyBitmap.idl \
-    XIeeeFloatBitmap.idl \
-    XIeeeFloatReadOnlyBitmap.idl \
-    XIntegerBitmap.idl \
-    XIntegerBitmapColorSpace.idl \
-    XIntegerReadOnlyBitmap.idl \
-    XLinePolyPolygon2D.idl \
-    XParametricPolyPolygon2D.idl \
-    XPolyPolygon2D.idl \
-    XSimpleCanvas.idl \
-    XSprite.idl \
-    XSpriteCanvas.idl \
-    XTextLayout.idl \
-    XVolatileBitmap.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/report/FixedLine.idl b/offapi/com/sun/star/report/FixedLine.idl
new file mode 100644
index 000000000000..e0fd1e274c2a
--- /dev/null
+++ b/offapi/com/sun/star/report/FixedLine.idl
@@ -0,0 +1,41 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_FixedLine_idl__
+#define __com_sun_star_report_FixedLine_idl__
+
+#include <com/sun/star/report/XFixedLine.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+published service FixedLine : XFixedLine;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/FixedText.idl b/offapi/com/sun/star/report/FixedText.idl
new file mode 100644
index 000000000000..66e18ca64dc6
--- /dev/null
+++ b/offapi/com/sun/star/report/FixedText.idl
@@ -0,0 +1,41 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_FixedText_idl__
+#define __com_sun_star_report_FixedText_idl__
+
+#include <com/sun/star/report/XFixedText.idl>
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+published service FixedText : XFixedText;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/FormatCondition.idl b/offapi/com/sun/star/report/FormatCondition.idl
new file mode 100644
index 000000000000..629b4c3ce29b
--- /dev/null
+++ b/offapi/com/sun/star/report/FormatCondition.idl
@@ -0,0 +1,36 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_FormatCondition_idl__
+#define __com_sun_star_report_FormatCondition_idl__
+
+#include <com/sun/star/report/XFormatCondition.idl>
+
+//=============================================================================
+ module com {  module sun {  module star {  module report {
+//=============================================================================
+
+service FormatCondition : XFormatCondition;
+//=============================================================================
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/report/FormattedField.idl b/offapi/com/sun/star/report/FormattedField.idl
new file mode 100644
index 000000000000..8162d0a6c6f4
--- /dev/null
+++ b/offapi/com/sun/star/report/FormattedField.idl
@@ -0,0 +1,42 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_FormattedField_idl__
+#define __com_sun_star_report_FormattedField_idl__
+
+#include <com/sun/star/report/XFormattedField.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+published service FormattedField : XFormattedField;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/Function.idl b/offapi/com/sun/star/report/Function.idl
new file mode 100644
index 000000000000..1a683e21d446
--- /dev/null
+++ b/offapi/com/sun/star/report/Function.idl
@@ -0,0 +1,39 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_Function_idl__
+#define __com_sun_star_report_Function_idl__
+
+#include <com/sun/star/report/XFunction.idl>
+
+//=============================================================================
+ module com {  module sun {  module star {  module report {
+//=============================================================================
+
+service Function : XFunction
+{
+    create();
+};
+//=============================================================================
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/report/Group.idl b/offapi/com/sun/star/report/Group.idl
new file mode 100644
index 000000000000..5f57a961b26d
--- /dev/null
+++ b/offapi/com/sun/star/report/Group.idl
@@ -0,0 +1,41 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_Group_idl__
+#define __com_sun_star_report_Group_idl__
+
+#include <com/sun/star/report/XGroup.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+service Group : XGroup;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/Groups.idl b/offapi/com/sun/star/report/Groups.idl
new file mode 100644
index 000000000000..13ca11d9b0ba
--- /dev/null
+++ b/offapi/com/sun/star/report/Groups.idl
@@ -0,0 +1,38 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_Groups_idl__
+#define __com_sun_star_report_Groups_idl__
+
+#include <com/sun/star/report/XGroups.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+service Groups : XGroups;
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/report/ImageControl.idl b/offapi/com/sun/star/report/ImageControl.idl
new file mode 100644
index 000000000000..04677fb3fdcc
--- /dev/null
+++ b/offapi/com/sun/star/report/ImageControl.idl
@@ -0,0 +1,42 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_ImageControl_idl__
+#define __com_sun_star_report_ImageControl_idl__
+
+#include <com/sun/star/report/XImageControl.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+published service ImageControl : XImageControl;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/ReportControlFormat.idl b/offapi/com/sun/star/report/ReportControlFormat.idl
new file mode 100644
index 000000000000..e3030f86958a
--- /dev/null
+++ b/offapi/com/sun/star/report/ReportControlFormat.idl
@@ -0,0 +1,39 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_ReportControlFormat_idl__
+#define __com_sun_star_report_ReportControlFormat_idl__
+
+#include <com/sun/star/report/XReportControlFormat.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+service ReportControlFormat : XReportControlFormat;
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/report/ReportControlModel.idl b/offapi/com/sun/star/report/ReportControlModel.idl
new file mode 100644
index 000000000000..a18c85dad2e3
--- /dev/null
+++ b/offapi/com/sun/star/report/ReportControlModel.idl
@@ -0,0 +1,42 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_ReportControlModel_idl__
+#define __com_sun_star_report_ReportControlModel_idl__
+
+#include <com/sun/star/report/XReportControlModel.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+service ReportControlModel : XReportControlModel;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/ReportDefinition.idl b/offapi/com/sun/star/report/ReportDefinition.idl
new file mode 100644
index 000000000000..4e2f0ed858d7
--- /dev/null
+++ b/offapi/com/sun/star/report/ReportDefinition.idl
@@ -0,0 +1,40 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_ReportDefinition_idl__
+#define __com_sun_star_report_ReportDefinition_idl__
+
+#include <com/sun/star/report/XReportDefinition.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+published service ReportDefinition : XReportDefinition;
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/report/Section.idl b/offapi/com/sun/star/report/Section.idl
new file mode 100644
index 000000000000..7ceb7f2b55a8
--- /dev/null
+++ b/offapi/com/sun/star/report/Section.idl
@@ -0,0 +1,44 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_Section_idl__
+#define __com_sun_star_report_Section_idl__
+
+#include <com/sun/star/report/XSection.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+ interface XGroup;
+//=============================================================================
+
+
+
+service Section : XSection;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/Shape.idl b/offapi/com/sun/star/report/Shape.idl
new file mode 100644
index 000000000000..855f0f13698e
--- /dev/null
+++ b/offapi/com/sun/star/report/Shape.idl
@@ -0,0 +1,42 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_report_Shape_idl__
+#define __com_sun_star_report_Shape_idl__
+
+#include <com/sun/star/report/XShape.idl>
+
+//=============================================================================
+
+ module com {  module sun {  module star {  module report {
+
+//=============================================================================
+
+service Shape : XShape;
+//=============================================================================
+
+}; }; }; };
+
+/*=============================================================================
+
+=============================================================================*/
+#endif
diff --git a/offapi/com/sun/star/report/XFixedLine.idl b/offapi/com/sun/star/report/XFixedLine.idl
index 6169fe29acd8..93b132b9de11 100644
--- a/offapi/com/sun/star/report/XFixedLine.idl
+++ b/offapi/com/sun/star/report/XFixedLine.idl
@@ -93,7 +93,6 @@ published interface XFixedLine
     //-------------------------------------------------------------------------
 };
 
-published service FixedLine : XFixedLine;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XFixedText.idl b/offapi/com/sun/star/report/XFixedText.idl
index 3e5349a5d40d..9ec10186f9d6 100644
--- a/offapi/com/sun/star/report/XFixedText.idl
+++ b/offapi/com/sun/star/report/XFixedText.idl
@@ -40,7 +40,6 @@ published interface XFixedText
     [attribute,bound] string Label;
 };
 
-published service FixedText : XFixedText;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XFormatCondition.idl b/offapi/com/sun/star/report/XFormatCondition.idl
index 601e409bca14..7fc25d89aeb7 100644
--- a/offapi/com/sun/star/report/XFormatCondition.idl
+++ b/offapi/com/sun/star/report/XFormatCondition.idl
@@ -50,7 +50,6 @@ published interface XFormatCondition
     [attribute,bound] string Formula;
 };
 
-service FormatCondition : XFormatCondition;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XFormattedField.idl b/offapi/com/sun/star/report/XFormattedField.idl
index 7afd55de6f7a..9f5d3c517225 100644
--- a/offapi/com/sun/star/report/XFormattedField.idl
+++ b/offapi/com/sun/star/report/XFormattedField.idl
@@ -57,7 +57,6 @@ published interface XFormattedField
     [attribute,bound] com::sun::star::util::XNumberFormatsSupplier FormatsSupplier;
 };
 
-published service FormattedField : XFormattedField;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XFunction.idl b/offapi/com/sun/star/report/XFunction.idl
index d95faaef9065..4e4839e83f04 100644
--- a/offapi/com/sun/star/report/XFunction.idl
+++ b/offapi/com/sun/star/report/XFunction.idl
@@ -76,10 +76,6 @@ published interface XFunction
     [attribute,bound] com::sun::star::beans::Optional<string> InitialFormula;
 };
 
-service Function : XFunction
-{
-    create();
-};
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XGroup.idl b/offapi/com/sun/star/report/XGroup.idl
index 5ceb94eabcf5..d760d4e2accc 100644
--- a/offapi/com/sun/star/report/XGroup.idl
+++ b/offapi/com/sun/star/report/XGroup.idl
@@ -134,7 +134,6 @@ published interface XGroup
     [attribute,bound] boolean ResetPageNumber;
 };
 
-service Group : XGroup;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XGroups.idl b/offapi/com/sun/star/report/XGroups.idl
index d7310d933a7a..49d7cbc43c53 100644
--- a/offapi/com/sun/star/report/XGroups.idl
+++ b/offapi/com/sun/star/report/XGroups.idl
@@ -71,7 +71,6 @@ published interface XGroups
     [attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition;
 };
 
-service Groups : XGroups;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XImageControl.idl b/offapi/com/sun/star/report/XImageControl.idl
index caee0cefcaa1..cf0c53f49e83 100644
--- a/offapi/com/sun/star/report/XImageControl.idl
+++ b/offapi/com/sun/star/report/XImageControl.idl
@@ -77,7 +77,6 @@ published interface XImageControl
     [attribute,bound] boolean PreserveIRI;
 };
 
-published service ImageControl : XImageControl;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XReportControlFormat.idl b/offapi/com/sun/star/report/XReportControlFormat.idl
index af42ca9b95dd..8bed321eb148 100644
--- a/offapi/com/sun/star/report/XReportControlFormat.idl
+++ b/offapi/com/sun/star/report/XReportControlFormat.idl
@@ -602,7 +602,6 @@ published interface XReportControlFormat
     };
 };
 
-service ReportControlFormat : XReportControlFormat;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XReportControlModel.idl b/offapi/com/sun/star/report/XReportControlModel.idl
index 4f549dda1964..32e1228cb872 100644
--- a/offapi/com/sun/star/report/XReportControlModel.idl
+++ b/offapi/com/sun/star/report/XReportControlModel.idl
@@ -100,7 +100,6 @@ published interface XReportControlModel
     };
 };
 
-service ReportControlModel : XReportControlModel;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XReportDefinition.idl b/offapi/com/sun/star/report/XReportDefinition.idl
index b1e468538dea..0740e83ebe5f 100644
--- a/offapi/com/sun/star/report/XReportDefinition.idl
+++ b/offapi/com/sun/star/report/XReportDefinition.idl
@@ -347,7 +347,6 @@ published interface XReportDefinition
     };
 };
 
-published service ReportDefinition : XReportDefinition;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XSection.idl b/offapi/com/sun/star/report/XSection.idl
index 6f4b77780fdf..56b1e152f524 100644
--- a/offapi/com/sun/star/report/XSection.idl
+++ b/offapi/com/sun/star/report/XSection.idl
@@ -180,7 +180,6 @@ published interface XSection
     [attribute,readonly] com::sun::star::report::XReportDefinition ReportDefinition;
 };
 
-service Section : XSection;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/XShape.idl b/offapi/com/sun/star/report/XShape.idl
index c866b099ebd2..7d9f9367eb10 100644
--- a/offapi/com/sun/star/report/XShape.idl
+++ b/offapi/com/sun/star/report/XShape.idl
@@ -81,7 +81,6 @@ published interface XShape
     [attribute,bound] boolean Opaque;
 };
 
-service Shape : XShape;
 //=============================================================================
 
 }; }; }; };
diff --git a/offapi/com/sun/star/report/inspection/makefile.mk b/offapi/com/sun/star/report/inspection/makefile.mk
deleted file mode 100644
index 93546817386d..000000000000
--- a/offapi/com/sun/star/report/inspection/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssrptins
-PACKAGE=com$/sun$/star$/report$/inspection
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    DefaultComponentInspectorModel.idl	\
-    ReportComponentHandler.idl			\
-    DataProviderHandler.idl	
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/report/makefile.mk b/offapi/com/sun/star/report/makefile.mk
deleted file mode 100644
index 1bc0948da41a..000000000000
--- a/offapi/com/sun/star/report/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssreport
-PACKAGE=com$/sun$/star$/report
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        modules.idl\
-    XReportDefinition.idl	\
-    XReportComponent.idl	\
-    XReportControlModel.idl	\
-    XGroups.idl				\
-    XGroup.idl				\
-    XFormattedField.idl		\
-    XFixedText.idl			\
-    XImageControl.idl		\
-    XSection.idl			\
-    ReportPrintOption.idl	\
-    GroupKeepTogether.idl	\
-    ForceNewPage.idl		\
-    KeepTogether.idl		\
-    XReportEngine.idl		\
-    XFormatCondition.idl	\
-    XReportControlFormat.idl	\
-    XFunction.idl			\
-    XFunctions.idl			\
-    XFunctionsSupplier.idl	\
-    GroupOn.idl				\
-    XShape.idl				\
-    XFixedLine.idl
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/report/meta/makefile.mk b/offapi/com/sun/star/report/meta/makefile.mk
deleted file mode 100644
index 11c067552738..000000000000
--- a/offapi/com/sun/star/report/meta/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssrptmeta
-PACKAGE=com$/sun$/star$/report$/meta
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XFunctionManager.idl        \
-    XFunctionCategory.idl       \
-    XFunctionDescription.idl    \
-    XFormulaParser.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/resource/makefile.mk b/offapi/com/sun/star/resource/makefile.mk
deleted file mode 100644
index c5677ec535d4..000000000000
--- a/offapi/com/sun/star/resource/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssresource
-PACKAGE=com$/sun$/star$/resource
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    MissingResourceException.idl\
-    OfficeResourceLoader.idl\
-    XLocale.idl\
-    XResourceBundle.idl\
-    XResourceBundleLoader.idl\
-    XStringResourceResolver.idl\
-    XStringResourceManager.idl\
-    XStringResourcePersistence.idl\
-    XStringResourceWithStorage.idl\
-    XStringResourceWithLocation.idl\
-    XStringResourceSupplier.idl\
-    StringResource.idl\
-    StringResourceWithLocation.idl\
-    StringResourceWithStorage.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/scanner/makefile.mk b/offapi/com/sun/star/scanner/makefile.mk
deleted file mode 100644
index 5844b35b6aa8..000000000000
--- a/offapi/com/sun/star/scanner/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssscanner
-PACKAGE=com$/sun$/star$/scanner
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ScanError.idl\
-    ScannerContext.idl\
-    ScannerException.idl\
-    ScannerManager.idl\
-    XScannerManager.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/script/browse/makefile.mk b/offapi/com/sun/star/script/browse/makefile.mk
deleted file mode 100644
index 58758d439a81..000000000000
--- a/offapi/com/sun/star/script/browse/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssbrowse
-PACKAGE=com$/sun$/star$/script$/browse
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XBrowseNode.idl\
-    XBrowseNodeFactory.idl\
-    BrowseNodeFactoryViewTypes.idl\
-    BrowseNodeFactory.idl\
-    BrowseNode.idl\
-    BrowseNodeTypes.idl
-     
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/script/makefile.mk b/offapi/com/sun/star/script/makefile.mk
deleted file mode 100644
index 6f2202bfd46f..000000000000
--- a/offapi/com/sun/star/script/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssscript
-PACKAGE=com$/sun$/star$/script
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    DocumentDialogLibraryContainer.idl\
-    DocumentScriptLibraryContainer.idl\
-    LibraryNotLoadedException.idl\
-    XLibraryContainer.idl\
-    XLibraryContainer2.idl\
-        XLibraryContainer3.idl\
-    XLibraryContainerPassword.idl\
-    XLibraryContainerExport.idl\
-    XPersistentLibraryContainer.idl\
-    XStorageBasedLibraryContainer.idl\
-    ModuleSizeExceededRequest.idl\
-    ModuleInfo.idl\
-    ModuleType.idl\
-    NativeObjectWrapper.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/script/provider/makefile.mk b/offapi/com/sun/star/script/provider/makefile.mk
deleted file mode 100644
index 1e8057ec4324..000000000000
--- a/offapi/com/sun/star/script/provider/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssprovider
-PACKAGE=com$/sun$/star$/script$/provider
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-        XScript.idl\
-        XScriptContext.idl\
-        XScriptProvider.idl\
-        XScriptProviderSupplier.idl\
-        ScriptProvider.idl\
-        MasterScriptProvider.idl\
-        XScriptProviderFactory.idl\
-        LanguageScriptProvider.idl\
-        ScriptProviderForJava.idl\
-        ScriptProviderForJavaScript.idl\
-        ScriptProviderForBeanShell.idl\
-        MasterScriptProviderFactory.idl\
-        ScriptErrorRaisedException.idl\
-        ScriptExceptionRaisedException.idl\
-        ScriptFrameworkErrorException.idl\
-        ScriptFrameworkErrorType.idl\
-        ScriptURIHelper.idl\
-        XScriptURIHelper.idl\
-        ScriptProviderForBasic.idl
-
-# ------------------------------------------------------------------
-
-# ------------------------------------------------------------------
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/script/vba/makefile.mk b/offapi/com/sun/star/script/vba/makefile.mk
deleted file mode 100644
index 342d0df16def..000000000000
--- a/offapi/com/sun/star/script/vba/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssscriptvba
-PACKAGE=com$/sun$/star$/script$/vba
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    VBAEventId.idl \
-    VBAEventProcessor.idl \
-    VBAMacroResolver.idl \
-    VBAScriptEvent.idl \
-    VBAScriptEventId.idl \
-    VBASpreadsheetEventProcessor.idl \
-    VBATextEventProcessor.idl \
-    XVBACompatibility.idl \
-    XVBAEventProcessor.idl \
-    XVBAMacroResolver.idl \
-    XVBAModuleInfo.idl \
-    XVBAScriptListener.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/sdb/application/makefile.mk b/offapi/com/sun/star/sdb/application/makefile.mk
deleted file mode 100644
index 0e38fc8046a2..000000000000
--- a/offapi/com/sun/star/sdb/application/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssdbapp
-PACKAGE=com$/sun$/star$/sdb$/application
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-UNOIDLDEFS += -w
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    DefaultViewController.idl \
-    CopyTableContinuation.idl \
-    CopyTableOperation.idl \
-    CopyTableRowEvent.idl \
-    CopyTableWizard.idl \
-    DatabaseObject.idl \
-    DatabaseObjectContainer.idl \
-    NamedDatabaseObject.idl \
-    XCopyTableWizard.idl \
-    XCopyTableListener.idl \
-    XDatabaseDocumentUI.idl \
-    XTableUIProvider.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/sdb/makefile.mk b/offapi/com/sun/star/sdb/makefile.mk
deleted file mode 100644
index d06df41d2ef4..000000000000
--- a/offapi/com/sun/star/sdb/makefile.mk
+++ /dev/null
@@ -1,143 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssdb
-PACKAGE=com$/sun$/star$/sdb
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-UNOIDLDEFS += -w
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    BooleanComparisonMode.idl \
-    CallableStatement.idl \
-    Column.idl \
-    ColumnDescriptorControl.idl \
-    ColumnDescriptorControlModel.idl \
-    ColumnSettings.idl \
-    CommandType.idl \
-    Connection.idl \
-    ContentLoader.idl \
-    DataAccessDescriptor.idl \
-    DataAccessDescriptorFactory.idl \
-    DatabaseAccess.idl \
-    DatabaseAccessConnection.idl \
-    DatabaseAccessContext.idl \
-    DatabaseAccessDataSource.idl\
-    DatabaseContext.idl \
-    DatabaseDocument.idl \
-    DatabaseEnvironment.idl \
-    DatabaseInteractionHandler.idl \
-    DatabaseRegistrationEvent.idl \
-    DataColumn.idl \
-    DataSettings.idl \
-    DataSource.idl \
-    DatasourceAdministrationDialog.idl \
-    DataSourceBrowser.idl \
-    DefinitionContainer.idl \
-    DefinitionContent.idl \
-    Document.idl \
-    DocumentContainer.idl \
-    DocumentDataSource.idl \
-    DocumentDefinition.idl \
-    DocumentSaveRequest.idl \
-    ErrorCondition.idl \
-    ErrorMessageDialog.idl \
-    Forms.idl \
-    InteractionHandler.idl \
-    OfficeDatabaseDocument.idl \
-    OrderColumn.idl \
-    ParametersRequest.idl \
-    PreparedStatement.idl \
-    Query.idl \
-    QueryDefinition.idl \
-    QueryDescriptor.idl \
-    QueryDesign.idl \
-    RelationDesign.idl \
-    Reports.idl \
-    ResultColumn.idl \
-    ResultSet.idl \
-    RowChangeAction.idl \
-    RowChangeEvent.idl \
-    RowsChangeEvent.idl \
-    RowSet.idl \
-    RowSetVetoException.idl \
-    SingleSelectQueryAnalyzer.idl \
-    SingleSelectQueryComposer.idl \
-    SQLContext.idl \
-    SQLErrorEvent.idl \
-    SQLFilterOperator.idl \
-    SQLQueryComposer.idl \
-    Table.idl \
-    TableDescriptor.idl \
-    TableDesign.idl \
-    XAlterQuery.idl \
-    XBookmarksSupplier.idl \
-    XColumn.idl \
-    XColumnUpdate.idl \
-    XCommandPreparation.idl \
-    XCompletedConnection.idl \
-    XCompletedExecution.idl \
-    XDataAccessDescriptorFactory.idl \
-    XDatabaseAccess.idl \
-    XDatabaseAccessListener.idl \
-    XDatabaseRegistrations.idl \
-    XDatabaseRegistrationsListener.idl \
-    XDatabaseEnvironment.idl \
-    XDocumentDataSource.idl \
-    XFormDocumentsSupplier.idl \
-    XInteractionDocumentSave.idl \
-    XInteractionSupplyParameters.idl \
-    XOfficeDatabaseDocument.idl \
-    XParametersSupplier.idl \
-    XQueriesSupplier.idl \
-    XQueryDefinitionsSupplier.idl \
-    XReportDocumentsSupplier.idl \
-    XResultSetAccess.idl \
-    XRowSetApproveBroadcaster.idl \
-    XRowSetApproveListener.idl \
-    XRowSetChangeBroadcaster.idl \
-    XRowSetChangeListener.idl \
-    XRowsChangeBroadcaster.idl \
-    XRowsChangeListener.idl \
-    XRowSetSupplier.idl \
-    XSingleSelectQueryAnalyzer.idl \
-    XSingleSelectQueryComposer.idl \
-    XSubDocument.idl \
-    XSQLErrorBroadcaster.idl \
-    XSQLErrorListener.idl \
-    XSQLQueryComposer.idl \
-    XSQLQueryComposerFactory.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/sdb/tools/makefile.mk b/offapi/com/sun/star/sdb/tools/makefile.mk
deleted file mode 100644
index ab5c393064d3..000000000000
--- a/offapi/com/sun/star/sdb/tools/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssdbtools
-PACKAGE=com$/sun$/star$/sdb$/tools
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-UNOIDLDEFS += -w
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    CompositionType.idl \
-    XConnectionTools.idl \
-    XDataSourceMetaData.idl \
-    XObjectNames.idl \
-    XTableName.idl \
-    XTableRename.idl \
-    XViewAccess.idl \
-    XTableAlteration.idl \
-    XKeyAlteration.idl \
-    XIndexAlteration.idl \
-    XConnectionSupplier.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/sdbc/makefile.mk b/offapi/com/sun/star/sdbc/makefile.mk
deleted file mode 100644
index 0c5242550a49..000000000000
--- a/offapi/com/sun/star/sdbc/makefile.mk
+++ /dev/null
@@ -1,114 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssdbc
-PACKAGE=com$/sun$/star$/sdbc
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    BatchUpdateException.idl \
-    BestRowScope.idl \
-    BestRowType.idl \
-    CallableStatement.idl \
-    ChangeAction.idl \
-    ChangeEvent.idl \
-    ColumnSearch.idl \
-    ColumnType.idl \
-    ColumnValue.idl \
-    Connection.idl \
-    ConnectionPool.idl \
-    ConnectionProperties.idl \
-    DataTruncation.idl \
-    DataType.idl \
-    DBASEConnectionProperties.idl \
-    Deferrability.idl \
-    Driver.idl \
-    DriverManager.idl \
-    DriverPropertyInfo.idl \
-    FetchDirection.idl \
-    FILEConnectionProperties.idl \
-    FLATConnectionProperties.idl \
-    IndexType.idl \
-    JDBCConnectionProperties.idl \
-    KeyRule.idl \
-    ODBCConnectionProperties.idl \
-    PreparedStatement.idl \
-    ProcedureColumn.idl \
-    ProcedureResult.idl \
-    ResultSet.idl \
-    ResultSetConcurrency.idl \
-    ResultSetType.idl \
-    RowSet.idl \
-    SQLException.idl \
-    SQLWarning.idl \
-    Statement.idl \
-    TransactionIsolation.idl \
-    XArray.idl \
-    XBatchExecution.idl \
-    XBlob.idl \
-    XClob.idl \
-    XCloseable.idl \
-    XColumnLocate.idl \
-    XConnection.idl \
-    XDatabaseMetaData.idl \
-    XDatabaseMetaData2.idl \
-    XDataSource.idl \
-    XDriver.idl \
-    XDriverAccess.idl \
-    XDriverManager.idl \
-    XGeneratedResultSet.idl \
-    XIsolatedConnection.idl \
-    XMultipleResults.idl \
-    XOutParameters.idl \
-    XParameters.idl \
-    XPooledConnection.idl \
-    XPreparedBatchExecution.idl \
-    XPreparedStatement.idl \
-    XRef.idl \
-    XResultSet.idl \
-    XResultSetMetaData.idl \
-    XResultSetMetaDataSupplier.idl \
-    XResultSetUpdate.idl \
-    XRow.idl \
-    XRowSet.idl \
-    XRowSetListener.idl \
-    XRowUpdate.idl \
-    XSQLData.idl \
-    XSQLInput.idl \
-    XSQLOutput.idl \
-    XStatement.idl \
-    XStruct.idl \
-    XWarningsSupplier.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/sdbcx/makefile.mk b/offapi/com/sun/star/sdbcx/makefile.mk
deleted file mode 100644
index 3999342d999c..000000000000
--- a/offapi/com/sun/star/sdbcx/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssdbcx
-PACKAGE=com$/sun$/star$/sdbcx
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-IDLFILES=\
-    CheckOption.idl \
-    CompareBookmark.idl \
-    Column.idl \
-    ColumnDescriptor.idl \
-    Container.idl \
-    DatabaseDefinition.idl \
-    Descriptor.idl \
-    Driver.idl \
-    Group.idl \
-    GroupDescriptor.idl \
-    Index.idl \
-    IndexColumn.idl \
-    IndexColumnDescriptor.idl \
-    IndexDescriptor.idl \
-    Key.idl \
-    KeyColumn.idl \
-    KeyDescriptor.idl \
-    KeyColumnDescriptor.idl \
-    KeyDescriptor.idl \
-    KeyType.idl \
-    PreparedStatement.idl \
-    Privilege.idl \
-    PrivilegeObject.idl \
-    ReferenceColumn.idl \
-    ResultSet.idl \
-    Statement.idl \
-    Table.idl \
-    TableDescriptor.idl \
-    User.idl \
-    UserDescriptor.idl \
-    View.idl \
-    ViewDescriptor.idl \
-    XAlterTable.idl \
-    XAlterView.idl \
-    XAppend.idl \
-    XAuthorizable.idl \
-    XColumnsSupplier.idl \
-    XCreateCatalog.idl \
-    XDeleteRows.idl \
-    XDataDefinitionSupplier.idl \
-    XDataDescriptorFactory.idl \
-    XDrop.idl \
-    XDropCatalog.idl \
-    XGroupsSupplier.idl \
-    XIndexesSupplier.idl \
-    XKeysSupplier.idl \
-    XRename.idl \
-    XRowLocate.idl \
-    XTablesSupplier.idl \
-    XUser.idl \
-    XUsersSupplier.idl \
-    XViewsSupplier.idl \
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
diff --git a/offapi/com/sun/star/security/makefile.mk b/offapi/com/sun/star/security/makefile.mk
deleted file mode 100644
index 769480edfccb..000000000000
--- a/offapi/com/sun/star/security/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-#i20156 - new file for xmlsecurity module
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=xsec-security
-PACKAGE=com$/sun$/star$/security
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    CertificateException.idl            \
-    CryptographyException.idl           \
-    DocumentDigitalSignatures.idl       \
-    DocumentSignatureInformation.idl   \
-    EncryptionException.idl             \
-    KeyException.idl                    \
-    NoPasswordException.idl             \
-    SecurityInfrastructureException.idl \
-    SignatureException.idl              \
-    XCertificate.idl                    \
-    CertificateCharacters.idl           \
-    CertificateValidity.idl             \
-    XCertificateExtension.idl           \
-    XDocumentDigitalSignatures.idl	\
-    KeyUsage.idl			\
-    XCertificateContainer.idl		\
-    XSerialNumberAdapter.idl		\
-    SerialNumberAdapter.idl		\
-    CertificateContainer.idl \
-    CertificateContainerStatus.idl \
-    ExtAltNameType.idl \
-    XSanExtension.idl \
-    CertAltNameEntry.idl
-    
-    
-    
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/setup/InstallResponse.idl b/offapi/com/sun/star/setup/InstallResponse.idl
index f0b5fe767151..6540c7563268 100644
--- a/offapi/com/sun/star/setup/InstallResponse.idl
+++ b/offapi/com/sun/star/setup/InstallResponse.idl
@@ -23,17 +23,9 @@
 #ifndef __com_sun_star_setup_InstallResponse_idl__
 #define __com_sun_star_setup_InstallResponse_idl__
 
-module com {  module sun {  module star {  module setup {
-
-/// @deprecated
-published enum ResponseErrorCode
-{
-    // DocMerge: empty anyway
-    NOERROR,
+#include <com/sun/star/setup/ResponseErrorCode.idl>
 
-    // DocMerge: empty anyway
-    NOT_ENOUGH_SPACE
-    };
+module com {  module sun {  module star {  module setup {
 
 // DocMerge: empty anyway
 published struct InstallResponse
diff --git a/offapi/com/sun/star/setup/ResponseErrorCode.idl b/offapi/com/sun/star/setup/ResponseErrorCode.idl
new file mode 100644
index 000000000000..38ddf1b1ca27
--- /dev/null
+++ b/offapi/com/sun/star/setup/ResponseErrorCode.idl
@@ -0,0 +1,40 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_setup_ResponseErrorCode_idl__
+#define __com_sun_star_setup_ResponseErrorCode_idl__
+
+module com {  module sun {  module star {  module setup {
+
+/// @deprecated
+published enum ResponseErrorCode
+{
+    // DocMerge: empty anyway
+    NOERROR,
+
+    // DocMerge: empty anyway
+    NOT_ENOUGH_SPACE
+    };
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/setup/makefile.mk b/offapi/com/sun/star/setup/makefile.mk
deleted file mode 100644
index 42ba1570db5d..000000000000
--- a/offapi/com/sun/star/setup/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-TARGET=csssetup
-PACKAGE=com$/sun$/star$/setup
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------
-
-IDLFILES=\
-    UpdateType.idl			\
-    ActionType.idl			\
-    BaseAction.idl			\
-    CopyFileAction.idl		\
-    DeleteDirAction.idl		\
-    DeleteFileAction.idl		\
-    DeleteFolderAction.idl		\
-    DeleteFolderItemAction.idl	\
-    DownloadAction.idl		\
-    FontAction.idl	     		\
-    InstallEnvironment.idl		\
-    InstallResponse.idl		\
-    InstallType.idl			\
-    MakeDirAction.idl		\
-    MakeFolderAction.idl		\
-    MakeFolderItemAction.idl	\
-    MakeShortcutAction.idl		\
-    MirrorEntry.idl			\
-    ModuleInfo.idl			\
-    ModuleState.idl			\
-    OSType.idl			\
-    ProductRegistration.idl		\
-    ProfileItemAction.idl		\
-    Setup.idl			\
-    SizeInfo.idl			\
-    UnzipAction.idl			\
-    VersionIdentifier.idl		\
-    WindowsRegistryAction.idl	\
-    XSetup.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/sheet/FormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/FormulaOpCodeMapper.idl
new file mode 100644
index 000000000000..962741bd1462
--- /dev/null
+++ b/offapi/com/sun/star/sheet/FormulaOpCodeMapper.idl
@@ -0,0 +1,44 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_sheet_FormulaOpCodeMapper_idl__
+#define __com_sun_star_sheet_FormulaOpCodeMapper_idl__
+
+#include <com/sun/star/sheet/XFormulaOpCodeMapper.idl>
+
+//=============================================================================
+
+module com {  module sun {  module star {  module sheet {
+
+//=============================================================================
+
+//=============================================================================
+
+service FormulaOpCodeMapper : XFormulaOpCodeMapper;
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
index ccdcd8a3ad97..5dbe6be7877e 100644
--- a/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
+++ b/offapi/com/sun/star/sheet/XFormulaOpCodeMapper.idl
@@ -141,10 +141,6 @@ published interface XFormulaOpCodeMapper
 
 //=============================================================================
 
-service FormulaOpCodeMapper : XFormulaOpCodeMapper;
-
-//=============================================================================
-
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/sheet/makefile.mk b/offapi/com/sun/star/sheet/makefile.mk
deleted file mode 100644
index 8754c128be2a..000000000000
--- a/offapi/com/sun/star/sheet/makefile.mk
+++ /dev/null
@@ -1,349 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssheet
-PACKAGE=com$/sun$/star$/sheet
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleCell.idl\
-    AccessibleCsvCell.idl\
-    AccessibleCsvRuler.idl\
-    AccessibleCsvTable.idl\
-    AccessiblePageHeaderFooterAreasView.idl\
-    AccessibleSpreadsheet.idl\
-    AccessibleSpreadsheetDocumentView.idl\
-    AccessibleSpreadsheetPageView.idl\
-    ActivationEvent.idl\
-    AddressConvention.idl\
-    AddIn.idl\
-    Border.idl\
-    CellAnnotation.idl\
-    CellAnnotationShape.idl\
-    CellAnnotations.idl\
-    CellAnnotationsEnumeration.idl\
-    CellAreaLink.idl\
-    CellAreaLinks.idl\
-    CellAreaLinksEnumeration.idl\
-    CellDeleteMode.idl\
-    CellFlags.idl\
-    CellFormatRanges.idl\
-    CellFormatRangesEnumeration.idl\
-    CellInsertMode.idl\
-    Cells.idl\
-    CellsEnumeration.idl\
-    ComplexReference.idl\
-    ConditionOperator.idl\
-    ConsolidationDescriptor.idl\
-    DDEItemInfo.idl\
-    DDELink.idl\
-    DDELinkInfo.idl\
-    DDELinkMode.idl\
-    DDELinks.idl\
-    DDELinksEnumeration.idl\
-    DataImportMode.idl\
-    DataPilotDescriptor.idl\
-    DataPilotField.idl\
-    DataPilotFieldAutoShowInfo.idl\
-    DataPilotFieldFilter.idl\
-    DataPilotFieldGroup.idl\
-    DataPilotFieldGroupBy.idl\
-    DataPilotFieldGroupEnumeration.idl\
-    DataPilotFieldGroupInfo.idl\
-    DataPilotFieldGroupItem.idl\
-    DataPilotFieldGroups.idl\
-    DataPilotFieldGroupsEnumeration.idl\
-    DataPilotFieldLayoutInfo.idl\
-    DataPilotFieldLayoutMode.idl\
-    DataPilotFieldOrientation.idl\
-    DataPilotFieldReference.idl\
-    DataPilotFieldReferenceItemType.idl\
-    DataPilotFieldReferenceType.idl\
-    DataPilotFieldShowItemsMode.idl\
-    DataPilotFieldSortInfo.idl\
-    DataPilotFieldSortMode.idl\
-    DataPilotFields.idl\
-    DataPilotFieldsEnumeration.idl\
-    DataPilotItem.idl\
-    DataPilotItems.idl\
-    DataPilotItemsEnumeration.idl\
-    DataPilotOutputRangeType.idl\
-    DataPilotSource.idl\
-    DataPilotSourceDimension.idl\
-    DataPilotSourceDimensions.idl\
-    DataPilotSourceHierarchies.idl\
-    DataPilotSourceHierarchy.idl\
-    DataPilotSourceLevel.idl\
-    DataPilotSourceLevels.idl\
-    DataPilotSourceMember.idl\
-    DataPilotSourceMembers.idl\
-    DataPilotTable.idl\
-    DataPilotTableHeaderData.idl\
-    DataPilotTablePositionData.idl\
-    DataPilotTablePositionType.idl\
-    DataPilotTableResultData.idl\
-    DataPilotTables.idl\
-    DataPilotTablesEnumeration.idl\
-    DataResult.idl\
-    DataResultFlags.idl\
-    DatabaseImportDescriptor.idl\
-    DatabaseRange.idl\
-    DatabaseRanges.idl\
-    DatabaseRangesEnumeration.idl\
-    DimensionFlags.idl\
-    DocumentSettings.idl\
-     ExternalDocLink.idl\
-     ExternalDocLinks.idl\
-    ExternalLinkType.idl\
-    ExternalLinkInfo.idl\
-    ExternalReference.idl\
-     ExternalSheetCache.idl\
-    FillDateMode.idl\
-    FillDirection.idl\
-    FillMode.idl\
-    FilterConnection.idl\
-    FilterFormulaParser.idl\
-    FilterOperator.idl\
-    FilterOperator2.idl\
-    FormulaLanguage.idl\
-    FormulaMapGroup.idl\
-    FormulaMapGroupSpecialOffset.idl\
-    FormulaOpCodeMapEntry.idl\
-    FormulaParser.idl\
-    FormulaResult.idl\
-    FormulaToken.idl\
-    FunctionAccess.idl\
-    FunctionArgument.idl\
-    FunctionCategory.idl\
-    FunctionDescription.idl\
-    FunctionDescriptionEnumeration.idl\
-    FunctionDescriptions.idl\
-    GeneralFunction.idl\
-    GlobalSheetSettings.idl\
-    GoalResult.idl\
-    HeaderFooterContent.idl\
-    LabelRange.idl\
-    LabelRanges.idl\
-    LabelRangesEnumeration.idl\
-    LocalizedName.idl\
-    MemberResult.idl\
-    MemberResultFlags.idl\
-    MoveDirection.idl\
-    NamedRange.idl\
-    NamedRangeFlag.idl\
-    NamedRanges.idl\
-    NamedRangesEnumeration.idl\
-    NoConvergenceException.idl\
-    PasteOperation.idl\
-    RangeSelectionArguments.idl\
-    RangeSelectionEvent.idl\
-    RecentFunctions.idl\
-    ReferenceFlags.idl\
-    ResultEvent.idl\
-    Scenario.idl\
-    Scenarios.idl\
-    ScenariosEnumeration.idl\
-    Shape.idl\
-    SheetCell.idl\
-    SheetCellCursor.idl\
-    SheetCellRange.idl\
-    SheetCellRanges.idl\
-    SheetCellRangesEnumeration.idl\
-    SheetFilterDescriptor.idl\
-    SheetLink.idl\
-    SheetLinkMode.idl\
-    SheetLinks.idl\
-    SheetLinksEnumeration.idl\
-    SheetRangesQuery.idl\
-    SheetSortDescriptor.idl\
-    SheetSortDescriptor2.idl\
-    SingleReference.idl\
-    Solver.idl\
-    SolverConstraint.idl\
-    SolverConstraintOperator.idl\
-    Spreadsheet.idl\
-    SpreadsheetDocument.idl\
-    SpreadsheetDocumentSettings.idl\
-    SpreadsheetDrawPage.idl\
-    SpreadsheetView.idl\
-    SpreadsheetViewObjectsMode.idl\
-    SpreadsheetViewPane.idl\
-    SpreadsheetViewPanesEnumeration.idl\
-    SpreadsheetViewSettings.idl\
-    Spreadsheets.idl\
-    SpreadsheetsEnumeration.idl\
-    StatusBarFunction.idl\
-    SubTotalColumn.idl\
-    SubTotalDescriptor.idl\
-    SubTotalField.idl\
-    SubTotalFieldsEnumeration.idl\
-    TableAutoFormat.idl\
-    TableAutoFormatEnumeration.idl\
-    TableAutoFormatField.idl\
-    TableAutoFormats.idl\
-    TableAutoFormatsEnumeration.idl\
-    TableCellStyle.idl\
-    TableCellStyle.idl\
-    TableConditionalEntry.idl\
-    TableConditionalEntryEnumeration.idl\
-    TableConditionalFormat.idl\
-    TableFilterField.idl\
-    TableFilterField2.idl\
-    TableOperationMode.idl\
-    TablePageBreakData.idl\
-    TablePageStyle.idl\
-    TableValidation.idl\
-    TableValidationVisibility.idl\
-    UniqueCellFormatRanges.idl\
-    UniqueCellFormatRangesEnumeration.idl\
-    ValidationAlertStyle.idl\
-    ValidationType.idl\
-    VolatileResult.idl\
-    XActivationBroadcaster.idl\
-    XActivationEventListener.idl\
-    XAddIn.idl\
-    XAreaLink.idl\
-    XAreaLinks.idl\
-    XArrayFormulaRange.idl\
-    XArrayFormulaTokens.idl\
-    XCalculatable.idl\
-    XCellAddressable.idl\
-    XCellFormatRangesSupplier.idl\
-    XCellRangeAddressable.idl\
-    XCellRangeData.idl\
-    XCellRangeFormula.idl\
-    XCellRangeMovement.idl\
-    XCellRangeReferrer.idl\
-    XCellRangesAccess.idl\
-    XCellRangesQuery.idl\
-    XCellSeries.idl\
-    XCompatibilityNames.idl\
-    XConsolidatable.idl\
-    XConsolidationDescriptor.idl\
-    XDDELink.idl\
-    XDDELinkResults.idl\
-    XDDELinks.idl\
-    XDataPilotDataLayoutFieldSupplier.idl\
-    XDataPilotDescriptor.idl\
-    XDataPilotField.idl\
-    XDataPilotFieldGrouping.idl\
-    XDataPilotMemberResults.idl\
-    XDataPilotResults.idl\
-    XDataPilotTable.idl\
-    XDataPilotTable2.idl\
-    XDataPilotTables.idl\
-    XDataPilotTablesSupplier.idl\
-    XDatabaseRange.idl\
-    XDatabaseRanges.idl\
-    XDimensionsSupplier.idl\
-    XDocumentAuditing.idl\
-    XDrillDownDataSupplier.idl\
-    XEnhancedMouseClickBroadcaster.idl\
-    XExternalDocLink.idl\
-    XExternalDocLinks.idl\
-    XExternalSheetCache.idl\
-    XExternalSheetName.idl\
-    XFillAcrossSheet.idl\
-    XFilterFormulaParser.idl\
-    XFormulaOpCodeMapper.idl\
-    XFormulaParser.idl\
-    XFormulaQuery.idl\
-    XFormulaTokens.idl\
-    XFunctionAccess.idl\
-    XFunctionDescriptions.idl\
-    XGoalSeek.idl\
-    XHeaderFooterContent.idl\
-    XHierarchiesSupplier.idl\
-    XLabelRange.idl\
-    XLabelRanges.idl\
-    XLevelsSupplier.idl\
-    XMembersSupplier.idl\
-    XMultiFormulaTokens.idl\
-    XMultipleOperation.idl\
-    RangeScopeName.idl\
-    XNamedRange.idl\
-    XNamedRanges.idl\
-    XNamedRange2.idl\
-    XNamedRanges2.idl\
-    XPrintAreas.idl\
-    XRangeSelection.idl\
-    XRangeSelectionChangeListener.idl\
-    XRangeSelectionListener.idl\
-    XRecentFunctions.idl\
-    XResultListener.idl\
-    XScenario.idl\
-    XScenarioEnhanced.idl\
-    XScenarios.idl\
-    XScenariosSupplier.idl\
-    XSheetAnnotation.idl\
-    XSheetAnnotationAnchor.idl\
-    XSheetAnnotationShapeSupplier.idl\
-    XSheetAnnotations.idl\
-    XSheetAnnotationsSupplier.idl\
-    XSheetAuditing.idl\
-    XSheetCellCursor.idl\
-    XSheetCellRange.idl\
-    XSheetCellRangeContainer.idl\
-    XSheetCellRanges.idl\
-    XSheetCondition.idl\
-    XSheetConditionalEntries.idl\
-    XSheetConditionalEntry.idl\
-    XSheetFilterDescriptor.idl\
-    XSheetFilterDescriptor2.idl\
-    XSheetFilterable.idl\
-    XSheetFilterableEx.idl\
-    XSheetLinkable.idl\
-    XSheetOperation.idl\
-    XSheetOutline.idl\
-    XSheetPageBreak.idl\
-    XSheetPastable.idl\
-    XSolver.idl\
-    XSolverDescription.idl\
-    XSpreadsheet.idl\
-    XSpreadsheetDocument.idl\
-    XSpreadsheetView.idl\
-    XSpreadsheets.idl\
-    XSubTotalCalculatable.idl\
-    XSubTotalDescriptor.idl\
-    XSubTotalField.idl\
-    XUniqueCellFormatRangesSupplier.idl\
-    XUsedAreaCursor.idl\
-    XViewFreezable.idl\
-    XViewPane.idl\
-    XViewPanesSupplier.idl\
-    XViewSplitable.idl\
-    XVolatileResult.idl\
-    _NamedRange.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/chart2/XStyleSupplier.idl b/offapi/com/sun/star/style/XStyleSupplier.idl
index a2d1616cc78d..a2d1616cc78d 100644
--- a/offapi/com/sun/star/chart2/XStyleSupplier.idl
+++ b/offapi/com/sun/star/style/XStyleSupplier.idl
diff --git a/offapi/com/sun/star/style/makefile.mk b/offapi/com/sun/star/style/makefile.mk
deleted file mode 100644
index 84161f9c2770..000000000000
--- a/offapi/com/sun/star/style/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssstyle
-PACKAGE=com$/sun$/star$/style
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    BreakType.idl\
-    CaseMap.idl\
-    CellStyle.idl\
-    CharacterProperties.idl\
-    CharacterPropertiesAsian.idl\
-    CharacterPropertiesComplex.idl\
-    CharacterStyle.idl\
-    DropCapFormat.idl\
-    GraphicLocation.idl\
-    HorizontalAlignment.idl\
-    LineNumberPosition.idl\
-    LineSpacing.idl\
-    LineSpacingMode.idl\
-    NumberingAlignment.idl\
-    NumberingLevel.idl\
-    NumberingRule.idl\
-    NumberingType.idl\
-    PageProperties.idl\
-    PageStyle.idl\
-    PageStyleLayout.idl\
-    ParagraphAdjust.idl\
-    ParagraphProperties.idl\
-    ParagraphPropertiesAsian.idl\
-    ParagraphPropertiesComplex.idl\
-    ParagraphStyle.idl\
-    ParagraphStyleCategory.idl\
-    Style.idl\
-    StyleFamilies.idl\
-    StyleFamily.idl\
-    TabAlign.idl\
-    TabStop.idl\
-    VerticalAlignment.idl\
-    XDefaultsSupplier.idl\
-    XStyle.idl\
-    XStyleFamiliesSupplier.idl\
-    XStyleLoader.idl\
-    XStyleCondition.idl\
-    XAutoStylesSupplier.idl\
-    XAutoStyles.idl\
-    XAutoStyleFamily.idl\
-    XAutoStyle.idl
-    
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/svg/makefile.mk b/offapi/com/sun/star/svg/makefile.mk
deleted file mode 100644
index 2b453970d2fa..000000000000
--- a/offapi/com/sun/star/svg/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssvg
-PACKAGE=com$/sun$/star$/svg
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XSVGPrinter.idl\
-    XSVGWriter.idl	
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/sync/FilterData.idl b/offapi/com/sun/star/sync/FilterData.idl
new file mode 100644
index 000000000000..9fa57c6c72a2
--- /dev/null
+++ b/offapi/com/sun/star/sync/FilterData.idl
@@ -0,0 +1,37 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_sync_FilterData_idl__
+#define __com_sun_star_sync_FilterData_idl__
+
+//=============================================================================
+
+module com {  module sun {  module star {  module sync {
+
+published typedef sequence< string > FilterData;
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
diff --git a/offapi/com/sun/star/sync/SyncInfo.idl b/offapi/com/sun/star/sync/SyncInfo.idl
index bb0c0f05f8fb..6b0b0031b13b 100644
--- a/offapi/com/sun/star/sync/SyncInfo.idl
+++ b/offapi/com/sun/star/sync/SyncInfo.idl
@@ -27,13 +27,14 @@
 #ifndef __com_sun_star_sync_SyncScheme_idl__
 #include <com/sun/star/sync/SyncScheme.idl>
 #endif
+#ifndef __com_sun_star_sync_FilterData_idl__
+#include <com/sun/star/sync/FilterData.idl>
+#endif
 
 //=============================================================================
 
 module com {  module sun {  module star {  module sync {
 
-published typedef sequence< string > FilterData;
-
 //=============================================================================
 
 /// @deprecated
diff --git a/offapi/com/sun/star/sync/makefile.mk b/offapi/com/sun/star/sync/makefile.mk
deleted file mode 100644
index 4fd533eba59e..000000000000
--- a/offapi/com/sun/star/sync/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssync
-PACKAGE=com$/sun$/star$/sync
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    SyncCollector.idl\
-    Synchronizer.idl\
-    SyncElement.idl\
-    SyncType.idl\
-    SyncScheme.idl\
-    SyncAction.idl\
-    SyncEvent.idl\
-    SyncInfo.idl\
-    SyncMode.idl\
-    SyncOptions.idl\
-    XSyncCollector.idl\
-    XSynchronizer.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/sync2/makefile.mk b/offapi/com/sun/star/sync2/makefile.mk
deleted file mode 100644
index 9a7a783708a0..000000000000
--- a/offapi/com/sun/star/sync2/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ = ..$/..$/..$/..
-PRJNAME=offapi
-TARGET = csssync2
-PACKAGE = com$/sun$/star$/sync2
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-IDLFILES = \
-    BadPartnershipException.idl
-
-.INCLUDE: target.mk
-.INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/table/makefile.mk b/offapi/com/sun/star/table/makefile.mk
deleted file mode 100644
index af526ef0feaa..000000000000
--- a/offapi/com/sun/star/table/makefile.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csstable
-PACKAGE=com$/sun$/star$/table
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AccessibleCellView.idl      \
-    AccessibleTableView.idl	\
-    BorderLine.idl\
-    Cell.idl\
-    CellAddress.idl\
-    CellContentType.idl\
-    CellCursor.idl\
-    CellHoriJustify.idl\
-    CellOrientation.idl\
-    CellProperties.idl\
-    CellRange.idl\
-    CellRangeAddress.idl\
-    CellVertJustify.idl\
-    ShadowFormat.idl\
-    ShadowLocation.idl\
-    TableBorder.idl\
-    TableBorderDistances.idl\
-    TableChart.idl\
-    TableCharts.idl\
-    TableChartsEnumeration.idl\
-    TableColumn.idl\
-    TableColumns.idl\
-    TableColumnsEnumeration.idl\
-    TableOrientation.idl\
-    TableRow.idl\
-    TableRows.idl\
-    TableRowsEnumeration.idl\
-    TableSortDescriptor.idl\
-        TableSortDescriptor2.idl\
-        TableSortField.idl\
-        TableSortFieldType.idl\
-    XAutoFormattable.idl\
-    XCell.idl\
-    XMergeableCell.idl\
-    XMergeableCellRange.idl\
-    XCellCursor.idl\
-    XCellRange.idl\
-    XColumnRowRange.idl\
-    XTableChart.idl\
-    XTableCharts.idl\
-    XTableChartsSupplier.idl\
-    XTableColumns.idl\
-    XTableRows.idl\
-    CellRangeListSource.idl\
-    CellValueBinding.idl\
-    ListPositionCellBinding.idl\
-    XTable.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk
deleted file mode 100644
index 6699cea4999a..000000000000
--- a/offapi/com/sun/star/task/makefile.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csstask
-PACKAGE=com$/sun$/star$/task
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ClassifiedInteractionRequest.idl\
-    DocumentMacroConfirmationRequest.idl\
-    DocumentPasswordRequest.idl\
-    DocumentPasswordRequest2.idl\
-    DocumentMSPasswordRequest.idl\
-    DocumentMSPasswordRequest2.idl\
-    ErrorCodeRequest.idl\
-    ErrorCodeIOException.idl\
-    FutureDocumentVersionProductUpdateRequest.idl\
-    InteractionClassification.idl\
-    InteractionHandler.idl\
-    JobExecutor.idl\
-    Job.idl\
-    AsyncJob.idl\
-    MasterPasswordRequest.idl\
-    NoMasterException.idl\
-    PasswordContainer.idl\
-    PasswordContainerInteractionHandler.idl\
-    PasswordRequest.idl\
-    PasswordRequestMode.idl\
-    PDFExportException.idl\
-    OfficeRestartManager.idl\
-    UnsupportedOverwriteRequest.idl\
-    UrlRecord.idl\
-    UserRecord.idl\
-    XAsyncJob.idl\
-    XInteractionApprove.idl\
-    XInteractionAskLater.idl\
-    XInteractionDisapprove.idl\
-    XInteractionPassword.idl\
-    XInteractionPassword2.idl\
-    XJob.idl\
-    XJobExecutor.idl\
-    XJobListener.idl\
-    XMasterPasswordHandling.idl\
-    XMasterPasswordHandling2.idl\
-    XPasswordContainer.idl\
-    XRestartManager.idl\
-    XStatusIndicator.idl\
-    XStatusIndicatorFactory.idl\
-    XStatusIndicatorSupplier.idl\
-    XAbortChannel.idl\
-    XInteractionRequestStringResolver.idl\
-    InteractionRequestStringResolver.idl\
-    XUrlContainer.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/text/fieldmaster/makefile.mk b/offapi/com/sun/star/text/fieldmaster/makefile.mk
deleted file mode 100644
index 986414a09c0a..000000000000
--- a/offapi/com/sun/star/text/fieldmaster/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssfieldmaster
-PACKAGE=com$/sun$/star$/text$/fieldmaster
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Database.idl\
-    DDE.idl\
-    Bibliography.idl\
-    SetExpression.idl\
-    User.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/text/textfield/docinfo/makefile.mk b/offapi/com/sun/star/text/textfield/docinfo/makefile.mk
deleted file mode 100644
index a323c7991d15..000000000000
--- a/offapi/com/sun/star/text/textfield/docinfo/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csstextfielddocinfo
-PACKAGE=com$/sun$/star$/text$/textfield$/docinfo
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    ChangeAuthor.idl\
-    ChangeDateTime.idl\
-    CreateAuthor.idl\
-    CreateDateTime.idl\
-    Custom.idl\
-    Description.idl\
-    EditTime.idl\
-    Info0.idl\
-    Info1.idl\
-    Info2.idl\
-    Info3.idl\
-    Keywords.idl\
-    PrintAuthor.idl\
-    PrintDateTime.idl\
-    Revision.idl\
-    Subject.idl\
-    Title.idl\
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/text/textfield/makefile.mk b/offapi/com/sun/star/text/textfield/makefile.mk
deleted file mode 100644
index fa1991dd151b..000000000000
--- a/offapi/com/sun/star/text/textfield/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csstextfield
-PACKAGE=com$/sun$/star$/text$/textfield
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    URL.idl\
-    Annotation.idl\
-    Author.idl\
-    Bibliography.idl\
-    Chapter.idl\
-    CharacterCount.idl\
-    CombinedCharacters.idl\
-    ConditionalText.idl\
-    Database.idl\
-    DatabaseName.idl\
-    DatabaseNextSet.idl\
-    DatabaseNumberOfSet.idl\
-    DatabaseSetNumber.idl\
-    DateTime.idl\
-    DDE.idl\
-    DropDown.idl\
-    EmbeddedObjectCount.idl\
-    ExtendedUser.idl\
-    FileName.idl\
-    GetExpression.idl\
-    GetReference.idl\
-    GraphicObjectCount.idl\
-    HiddenParagraph.idl\
-    HiddenText.idl\
-    Input.idl\
-    InputUser.idl\
-    JumpEdit.idl\
-    Macro.idl\
-    MetadataField.idl\
-    PageCount.idl\
-    PageNumber.idl\
-    ParagraphCount.idl\
-    ReferencePageGet.idl\
-    ReferencePageSet.idl\
-    Script.idl\
-    SetExpression.idl\
-    TableCount.idl\
-    TableFormula.idl\
-    TemplateName.idl\
-    User.idl\
-    WordCount.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/ucb/smart/makefile.mk b/offapi/com/sun/star/ucb/smart/makefile.mk
deleted file mode 100644
index 3006f92b9125..000000000000
--- a/offapi/com/sun/star/ucb/smart/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssucbs
-PACKAGE=com$/sun$/star$/ucb$/smart
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    Content.idl\
-    XFactory.idl\
-    XContent.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/ui/dialogs/makefile.mk b/offapi/com/sun/star/ui/dialogs/makefile.mk
deleted file mode 100644
index 465173832fcf..000000000000
--- a/offapi/com/sun/star/ui/dialogs/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssuidialogs
-PACKAGE=com$/sun$/star$/ui$/dialogs
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    FilterOptionsDialog.idl\
-    ControlActions.idl\
-    ExecutableDialogException.idl\
-    ExecutableDialogResults.idl\
-    XExecutableDialog.idl\
-    CommonFilePickerElementIds.idl\
-    ExtendedFilePickerElementIds.idl\
-    FilePicker.idl\
-    FilePickerEvent.idl\
-    FilePreviewImageFormats.idl\
-    FolderPicker.idl\
-    ListboxControlActions.idl\
-    TemplateDescription.idl\
-    XFilePicker.idl\
-    XFilePicker2.idl\
-    XFilePickerControlAccess.idl	\
-    XFilePickerListener.idl\
-    XFilePickerNotifier.idl\
-    XFilePreview.idl\
-    XFilterGroupManager.idl\
-    XFilterManager.idl\
-    XFolderPicker.idl\
-        XControlAccess.idl\
-        XControlInformation.idl \
-        XAsynchronousExecutableDialog.idl \
-        XDialogClosedListener.idl \
-        DialogClosedEvent.idl \
-    XWizard.idl \
-    XWizardController.idl \
-    Wizard.idl \
-    XWizardPage.idl \
-    WizardButton.idl \
-    WizardTravelType.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/offapi/com/sun/star/util/SearchAlgorithms.idl b/offapi/com/sun/star/util/SearchAlgorithms.idl
new file mode 100644
index 000000000000..4a32c2498b07
--- /dev/null
+++ b/offapi/com/sun/star/util/SearchAlgorithms.idl
@@ -0,0 +1,48 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_lang_SearchAlgorithms_idl__
+#define __com_sun_star_lang_SearchAlgorithms_idl__
+
+
+//=============================================================================
+
+module com { module sun { module star { module util {
+
+//=============================================================================
+
+published enum SearchAlgorithms
+{
+    /// Literal
+    ABSOLUTE,   // implemented as a kind of Boyer-Moore
+    /// Regular expression
+    REGEXP,
+    /// Weighted Levenshtein Distance
+    APPROXIMATE
+};
+
+//=============================================================================
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/util/SearchFlags.idl b/offapi/com/sun/star/util/SearchFlags.idl
new file mode 100644
index 000000000000..a4ac5a720380
--- /dev/null
+++ b/offapi/com/sun/star/util/SearchFlags.idl
@@ -0,0 +1,136 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_lang_SearchFlags_idl__
+#define __com_sun_star_lang_SearchFlags_idl__
+
+
+//=============================================================================
+
+module com { module sun { module star { module util {
+
+//=============================================================================
+
+/// Flags for search methods
+published constants SearchFlags
+{
+    /**
+        @deprecated The constant ALL_IGNORE_CASE is never supported - use
+                    <const scope="com::sun::star::i18n">TransliterationModules::IGNORE_CASE</const>
+                    with
+                    <member>SearchOptions::transliterateFlags</member>
+                    instead.
+
+        @see <type scope="com::sun::star::i18n">TransliterationModules</type>
+    */
+    const long  ALL_IGNORE_CASE     = 0x00000001;
+
+    /** Flag for normal (Boyer-Moore) search / Search for word only. */
+    const long  NORM_WORD_ONLY      = 0x00000010;
+
+    /** Flag for "regular expression" search / Interpret as extended
+        regular expression.
+
+        @deprecated The flag is currently not supported by OOo.
+    */
+    const long  REG_EXTENDED        = 0x00000100;
+
+    /** Flag for "regular expression" search / No register information
+        or backreferences, i.e., avoid sub expressions. Return only
+        true/false if matched or not.
+
+        @deprecated The flag is currently not supported by OOo.
+    */
+    const long  REG_NOSUB           = 0x00000200;
+
+    /** Flag for "regular expression" search / Special new line
+        treatment.
+
+        @deprecated The flag is currently not supported by OOo.
+
+        <p> A NEWLINE character in string will not be matched by a
+        period outside bracket expression or by any form of a non
+        matching list. </p>
+
+        <p> A circumflex (^) in pattern when used to specify expression
+        anchoring will match the zero length string immediately after a
+        newline in string, regardless of the setting of
+        REG_NOT_BEGINOFLINE. </p>
+
+        <p> A dollar-sign ($) in pattern when used to specify expression
+        anchoring, will match zero-length string immediately before a
+        new line in string, regardless of the setting of
+        REG_NOT_ENDOFLINE. </p>
+    */
+    const long  REG_NEWLINE         = 0x00000400;
+
+    /** The first character in the string is not the beginning of the
+        line therefore ^ will not match with first character of the
+        string.
+    */
+    const long  REG_NOT_BEGINOFLINE = 0x00000800;
+
+    /** The last character in the string is not the end of the line
+        therefore $ will not match with last character of the string.
+    */
+    const long  REG_NOT_ENDOFLINE   = 0x00001000;
+
+    /** Flag for "Weighted Levenshtein Distance" search / Relaxed
+        checking of limit, split weigh pools.
+
+        <p> If not specified (<b>strict</b>), the search is sucessful if
+        the WLD is within a calculated limit where each insertion,
+        deletion and replacement adds a weight to a common pool of
+        weights. This is the mathematically correct WLD. </p>
+
+        <p> From a user's point of view the strict WLD is an
+        exclusive-OR of the arguments given, for example if allowed
+        insertions=2 and allowed replacements=2, the search fails if 2
+        characters had been inserted and an additional operation would
+        be needed to match. Depending on the weights it may also fail if
+        1 character was inserted and 1 character replaced and an
+        additional operation would be needed to match. The strict
+        algorithm may match less than expected from a first glance of
+        the specified arguments, but does not return false positives. </p>
+
+        <p> If specified (<b>relaxed</b>), the search is also successful
+        if the combined pool for insertions and deletions is below a
+        doubled calculated limit and replacements are treated
+        differently. Additionally, swapped characters are counted as one
+        replacement. </p>
+
+        <p> From a user's point of view the relaxed WLD is an
+        inclusive-OR of the arguments given, for example if allowed
+        insertions=2 and allowed replacements=2, the search succeeds if
+        2 characters had been inserted and an additional replacement is
+        needed to match. The relaxed algorithm may return false
+        positives, but meets user expectation better. </p>
+    */
+    const long  LEV_RELAXED     = 0x00010000;
+};
+
+//=============================================================================
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/util/SearchOptions.idl b/offapi/com/sun/star/util/SearchOptions.idl
new file mode 100644
index 000000000000..7a86977b2cf4
--- /dev/null
+++ b/offapi/com/sun/star/util/SearchOptions.idl
@@ -0,0 +1,82 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_lang_SearchOptions_idl__
+#define __com_sun_star_lang_SearchOptions_idl__
+
+
+#include <com/sun/star/lang/Locale.idl>
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/util/SearchAlgorithms.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module util {
+
+//=============================================================================
+
+published  struct SearchOptions  {
+    //-------------------------------------------------------------------------
+    /** search type */
+    SearchAlgorithms    algorithmType;
+
+    /** some flags - can be mixed
+
+        @see <type>SearchFlags</type>
+    */
+    long            searchFlag;
+
+    /** The text or pattern to be searched. */
+    string          searchString;
+
+    /** The replacement text
+        (is for optional replacing - SearchOption is only the data container for it) */
+    string          replaceString;
+
+    /** The locale for case insensitive search. */
+    ::com::sun::star::lang::Locale  Locale;
+
+    /** This many characters can be different (as a replacement) between
+        the found word and the search pattern in a "Weighted Levenshtein
+        Distance" search. */
+    long            changedChars;
+
+    /** This many characters can be missing in the found word in a
+        "Weighted Levenshtein Distance" search. */
+    long            deletedChars;
+
+    /** This many characters can be additional in the found word in a
+        "Weighted Levenshtein Distance" search. */
+    long            insertedChars;
+
+    /** Flags for the transliteration. Same meaning as the enum of
+        <type scope="com::sun::star::i18n">TransliterationModules</type>
+    */
+    long            transliterateFlags;
+};
+
+//=============================================================================
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/util/SearchResult.idl b/offapi/com/sun/star/util/SearchResult.idl
new file mode 100644
index 000000000000..d1efe4125bdb
--- /dev/null
+++ b/offapi/com/sun/star/util/SearchResult.idl
@@ -0,0 +1,60 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_lang_SearchResult_idl__
+#define __com_sun_star_lang_SearchResult_idl__
+
+
+//=============================================================================
+
+module com { module sun { module star { module util {
+
+//=============================================================================
+
+published  struct SearchResult  {
+    //-------------------------------------------------------------------------
+    /** Number of subexpressions,
+    if it is 0, then no match found; this value is 1 for ABSOLUTE and APPROXIMATE match.
+    The start and endOffset are always dependent on the search direction.
+    For example:
+    if you search "X" in the text "-X-" the offset are:
+        for forward:    start = 1, end = 2
+        for backward:   start = 2, end = 1
+    Forward, the startOffset is inclusive, the endOffset exclusive.
+    Backward, the startOffset is exclusive, the endOffset inclusive.
+
+    For regular expressions it can be greater than 1.
+    If the value is 1, startoffset[0] and endoffset[0] points to the matching sub string
+    if value is > 1, still startoffset[0] and endoffset[0] points to the matching substring for whole regular expression
+    startoffset[i] and endoffset[i] points to the matching substring of i th matching substring.
+    */
+    long subRegExpressions;
+    sequence<long> startOffset;     // inclusive
+    sequence<long> endOffset;       // exclusive
+};
+
+//=============================================================================
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/util/XTextSearch.idl b/offapi/com/sun/star/util/XTextSearch.idl
index a4960e60f227..ac19f027d9db 100644
--- a/offapi/com/sun/star/util/XTextSearch.idl
+++ b/offapi/com/sun/star/util/XTextSearch.idl
@@ -27,7 +27,8 @@
 
 #include <com/sun/star/lang/Locale.idl>
 #include <com/sun/star/uno/XInterface.idl>
-//#include <com/sun/star/lang/CascadeTransliterator.idl>
+#include <com/sun/star/util/SearchOptions.idl>
+#include <com/sun/star/util/SearchResult.idl>
 
 //=============================================================================
 
@@ -35,181 +36,6 @@ module com { module sun { module star { module util {
 
 //=============================================================================
 
-
-published enum SearchAlgorithms
-{
-    /// Literal
-    ABSOLUTE,   // implemented as a kind of Boyer-Moore
-    /// Regular expression
-    REGEXP,
-    /// Weighted Levenshtein Distance
-    APPROXIMATE
-};
-
-/// Flags for search methods
-published constants SearchFlags
-{
-    /**
-        @deprecated The constant ALL_IGNORE_CASE is never supported - use
-                    <const scope="com::sun::star::i18n">TransliterationModules::IGNORE_CASE</const>
-                    with
-                    <member>SearchOptions::transliterateFlags</member>
-                    instead.
-
-        @see <type scope="com::sun::star::i18n">TransliterationModules</type>
-    */
-    const long  ALL_IGNORE_CASE     = 0x00000001;
-
-    /** Flag for normal (Boyer-Moore) search / Search for word only. */
-    const long  NORM_WORD_ONLY      = 0x00000010;
-
-    /** Flag for "regular expression" search / Interpret as extended
-        regular expression.
-
-        @deprecated The flag is currently not supported by OOo.
-    */
-    const long  REG_EXTENDED        = 0x00000100;
-
-    /** Flag for "regular expression" search / No register information
-        or backreferences, i.e., avoid sub expressions. Return only
-        true/false if matched or not.
-
-        @deprecated The flag is currently not supported by OOo.
-    */
-    const long  REG_NOSUB           = 0x00000200;
-
-    /** Flag for "regular expression" search / Special new line
-        treatment.
-
-        @deprecated The flag is currently not supported by OOo.
-
-        <p> A NEWLINE character in string will not be matched by a
-        period outside bracket expression or by any form of a non
-        matching list. </p>
-
-        <p> A circumflex (^) in pattern when used to specify expression
-        anchoring will match the zero length string immediately after a
-        newline in string, regardless of the setting of
-        REG_NOT_BEGINOFLINE. </p>
-
-        <p> A dollar-sign ($) in pattern when used to specify expression
-        anchoring, will match zero-length string immediately before a
-        new line in string, regardless of the setting of
-        REG_NOT_ENDOFLINE. </p>
-    */
-    const long  REG_NEWLINE         = 0x00000400;
-
-    /** The first character in the string is not the beginning of the
-        line therefore ^ will not match with first character of the
-        string.
-    */
-    const long  REG_NOT_BEGINOFLINE = 0x00000800;
-
-    /** The last character in the string is not the end of the line
-        therefore $ will not match with last character of the string.
-    */
-    const long  REG_NOT_ENDOFLINE   = 0x00001000;
-
-    /** Flag for "Weighted Levenshtein Distance" search / Relaxed
-        checking of limit, split weigh pools.
-
-        <p> If not specified (<b>strict</b>), the search is successful if
-        the WLD is within a calculated limit where each insertion,
-        deletion and replacement adds a weight to a common pool of
-        weights. This is the mathematically correct WLD. </p>
-
-        <p> From a user's point of view the strict WLD is an
-        exclusive-OR of the arguments given, for example if allowed
-        insertions=2 and allowed replacements=2, the search fails if 2
-        characters had been inserted and an additional operation would
-        be needed to match. Depending on the weights it may also fail if
-        1 character was inserted and 1 character replaced and an
-        additional operation would be needed to match. The strict
-        algorithm may match less than expected from a first glance of
-        the specified arguments, but does not return false positives. </p>
-
-        <p> If specified (<b>relaxed</b>), the search is also successful
-        if the combined pool for insertions and deletions is below a
-        doubled calculated limit and replacements are treated
-        differently. Additionally, swapped characters are counted as one
-        replacement. </p>
-
-        <p> From a user's point of view the relaxed WLD is an
-        inclusive-OR of the arguments given, for example if allowed
-        insertions=2 and allowed replacements=2, the search succeeds if
-        2 characters had been inserted and an additional replacement is
-        needed to match. The relaxed algorithm may return false
-        positives, but meets user expectation better. </p>
-    */
-    const long  LEV_RELAXED     = 0x00010000;
-};
-
-
-published  struct SearchOptions  {
-    //-------------------------------------------------------------------------
-    /** search type */
-    SearchAlgorithms    algorithmType;
-
-    /** some flags - can be mixed
-
-        @see <type>SearchFlags</type>
-    */
-    long            searchFlag;
-
-    /** The text or pattern to be searched. */
-    string          searchString;
-
-    /** The replacement text
-        (is for optional replacing - SearchOption is only the data container for it) */
-    string          replaceString;
-
-    /** The locale for case insensitive search. */
-    ::com::sun::star::lang::Locale  Locale;
-
-    /** This many characters can be different (as a replacement) between
-        the found word and the search pattern in a "Weighted Levenshtein
-        Distance" search. */
-    long            changedChars;
-
-    /** This many characters can be missing in the found word in a
-        "Weighted Levenshtein Distance" search. */
-    long            deletedChars;
-
-    /** This many characters can be additional in the found word in a
-        "Weighted Levenshtein Distance" search. */
-    long            insertedChars;
-
-    /** Flags for the transliteration. Same meaning as the enum of
-        <type scope="com::sun::star::i18n">TransliterationModules</type>
-    */
-    long            transliterateFlags;
-};
-
-
-published  struct SearchResult  {
-    //-------------------------------------------------------------------------
-    /** Number of subexpressions,
-    if it is 0, then no match found; this value is 1 for ABSOLUTE and APPROXIMATE match.
-    The start and endOffset are always dependent on the search direction.
-    For example:
-    if you search "X" in the text "-X-" the offset are:
-        for forward:    start = 1, end = 2
-        for backward:   start = 2, end = 1
-    Forward, the startOffset is inclusive, the endOffset exclusive.
-    Backward, the startOffset is exclusive, the endOffset inclusive.
-
-    For regular expressions it can be greater than 1.
-    If the value is 1, startoffset[0] and endoffset[0] points to the matching sub string
-    if value is > 1, still startoffset[0] and endoffset[0] points to the matching substring for whole regular expression
-    startoffset[i] and endoffset[i] points to the matching substring of i th matching substring.
-    */
-    long subRegExpressions;
-    sequence<long> startOffset;     // inclusive
-    sequence<long> endOffset;       // exclusive
-};
-
-
-
 /** enables an object to search in its content.
  */
 published interface XTextSearch : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/util/makefile.mk b/offapi/com/sun/star/util/makefile.mk
deleted file mode 100644
index 9fe084f4b620..000000000000
--- a/offapi/com/sun/star/util/makefile.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssutil
-PACKAGE=com$/sun$/star$/util
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    MeasureUnit.idl\
-    AliasProgrammaticPair.idl \
-    CellProtection.idl\
-    ChangesEvent.idl\
-    ChangesSet.idl \
-    CloseVetoException.idl\
-    Color.idl\
-    Date.idl\
-    DateTime.idl\
-    DateTimeRange.idl\
-    DiskFullException.idl\
-    Duration.idl\
-    ElementChange.idl \
-    Endianness.idl \
-    FileIOException.idl\
-    InvalidStateException.idl\
-    Language.idl\
-    NumberFormat.idl\
-    NumberFormatProperties.idl\
-    NumberFormats.idl\
-    NumberFormatSettings.idl\
-    NumberFormatsSupplier.idl\
-    NumberFormatter.idl\
-    ModeChangeEvent.idl\
-    ReplaceDescriptor.idl\
-    SearchDescriptor.idl\
-    Sortable.idl\
-    SortDescriptor.idl\
-    SortDescriptor2.idl\
-    SortField.idl\
-    SortFieldType.idl\
-    TextSearch.idl\
-    Time.idl\
-    TriState.idl\
-    URL.idl\
-    URLTransformer.idl\
-    XArchiver.idl\
-    XCancellable.idl\
-    XCancelManager.idl\
-    XChainable.idl\
-    XChangesBatch.idl \
-    XChangesListener.idl \
-    XChangesNotifier.idl \
-    XChangesSet.idl	\
-    XCloneable.idl\
-    XCloseable.idl\
-    XCloseBroadcaster.idl\
-    XCloseListener.idl\
-    XFlushable.idl\
-    XFlushListener.idl\
-    XImportable.idl\
-    XIndent.idl\
-    XLinkUpdate.idl\
-    XLocalizedAliases.idl\
-    XMergeable.idl\
-    XModeChangeBroadcaster.idl\
-    XModeChangeListener.idl\
-    XModeChangeApproveListener.idl\
-    XModeSelector.idl\
-    XModifiable.idl\
-    XModifiable2.idl\
-    XModifyBroadcaster.idl\
-    XBroadcaster.idl\
-    XModifyListener.idl\
-    XNumberFormatPreviewer.idl\
-    XNumberFormats.idl\
-    XNumberFormatsSupplier.idl\
-    XNumberFormatter.idl\
-    XNumberFormatTypes.idl\
-    XPropertyReplace.idl\
-    XProtectable.idl\
-    XRefreshable.idl\
-    XRefreshListener.idl\
-    XReplaceable.idl\
-    XReplaceDescriptor.idl\
-    XSearchable.idl\
-    XSearchDescriptor.idl\
-    XSimpleErrorHandler.idl\
-    XSortable.idl\
-    XStringAbbreviation.idl\
-    XStringWidth.idl\
-    XStringMapping.idl\
-    XStringEscape.idl\
-    XTextSearch.idl\
-    XUpdatable.idl\
-    XURLTransformer.idl\
-    XUniqueIDFactory.idl\
-    VetoException.idl\
-    DataEditorEventType.idl\
-    DataEditorEvent.idl\
-    XDataEditorListener.idl\
-    XDataEditor.idl\
-    MalformedNumberFormatException.idl\
-    NotNumericException.idl\
-    XAtomServer.idl\
-    AtomClassRequest.idl\
-    AtomDescription.idl\
-    XStringSubstitution.idl\
-    PathSettings.idl\
-    PathSubstitution.idl\
-    XTimeStamped.idl\
-    OfficeInstallationDirectories.idl\
-    XOfficeInstallationDirectories.idl\
-    RevisionTag.idl\
-    UriAbbreviation.idl\
-    XJobManager.idl\
-    JobManager.idl\
-    XLockable.idl\
-    NotLockedException.idl\
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/view/makefile.mk b/offapi/com/sun/star/view/makefile.mk
deleted file mode 100644
index f9f7c910499d..000000000000
--- a/offapi/com/sun/star/view/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssview
-PACKAGE=com$/sun$/star$/view
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    DocumentZoomType.idl\
-    OfficeDocumentView.idl\
-    PaperFormat.idl\
-    PaperOrientation.idl\
-    PrintableState.idl\
-    PrintableStateEvent.idl\
-    PrinterDescriptor.idl\
-    PrintOptions.idl\
-    PrintSettings.idl\
-    RenderDescriptor.idl\
-    RenderOptions.idl\
-    ViewSettings.idl\
-    XControlAccess.idl\
-    XFormLayerAccess.idl\
-    XLineCursor.idl\
-    XPrintable.idl\
-    XPrintableBroadcaster.idl\
-    XPrintableListener.idl\
-    XPrintPreview.idl\
-    XPrintSettingsSupplier.idl\
-    XRenderable.idl\
-    XScreenCursor.idl\
-    XSelectionChangeListener.idl\
-    XSelectionSupplier.idl\
-    XViewCursor.idl\
-    XViewSettingsSupplier.idl\
-    PrintJobEvent.idl\
-    XPrintJob.idl\
-    XPrintJobBroadcaster.idl\
-    XPrintJobListener.idl\
-    XMultiSelectionSupplier.idl\
-    SelectionType.idl\
-    DuplexMode.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xforms/makefile.mk b/offapi/com/sun/star/xforms/makefile.mk
deleted file mode 100644
index 25da69af62d1..000000000000
--- a/offapi/com/sun/star/xforms/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssxforms
-PACKAGE=com$/sun$/star$/xforms
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XFormsSupplier.idl\
-    XModel.idl \
-    XDataTypeRepository.idl \
-    XFormsEvent.idl \
-    XFormsUIHelper1.idl \
-    XSubmission.idl \
-    Binding.idl \
-    InvalidDataOnSubmitException.idl \
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/crypto/makefile.mk b/offapi/com/sun/star/xml/crypto/makefile.mk
deleted file mode 100644
index a486c689f26f..000000000000
--- a/offapi/com/sun/star/xml/crypto/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-#i20156 - new file for xmlsecurity module
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=xsec-crypto
-PACKAGE=com$/sun$/star$/xml$/crypto
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XXMLSecurityTemplate.idl     \
-    XXMLSignature.idl     \
-    XXMLSignatureTemplate.idl     \
-    XXMLEncryption.idl     \
-    XXMLEncryptionTemplate.idl     \
-    XXMLSecurityContext.idl     \
-    XSecurityEnvironment.idl     \
-    XSEInitializer.idl     \
-    XMLSignature.idl     \
-    XMLSignatureTemplate.idl     \
-    XMLEncryption.idl     \
-    XMLEncryptionTemplate.idl     \
-    XMLSecurityContext.idl     \
-    SecurityEnvironment.idl     \
-    SEInitializer.idl     \
-    XMLSignatureException.idl     \
-    XMLEncryptionException.idl     \
-    XUriBinding.idl    \
-    CipherID.idl \
-    DigestID.idl \
-    XCipherContext.idl \
-    XCipherContextSupplier.idl \
-    XDigestContext.idl \
-    XDigestContextSupplier.idl \
-    SecurityOperationStatus.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl b/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl
new file mode 100644
index 000000000000..3219142b0ff6
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl
@@ -0,0 +1,44 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_xml_crypto_sax_constofsecurityid_idl_
+#define __com_sun_star_xml_crypto_sax_constofsecurityid_idl_
+
+module com { module sun { module star { module xml { module crypto { module sax {
+
+/**
+ * Represents the undefined security id
+ */
+constants ConstOfSecurityId
+{
+    const long UNDEFINEDSECURITYID = -1;
+};
+
+} ; } ; } ; } ; } ; } ;
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl
new file mode 100644
index 000000000000..7f027b362edb
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl
@@ -0,0 +1,60 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_
+#define __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_
+
+module com { module sun { module star { module xml { module crypto { module sax {
+
+/**
+ * Defines priority for the element mark's notification.
+ * <p>
+ * The PRI_MINIMUM priority is a value less than any practical
+ * priority value, it is used when compare between different
+ * priority values.
+ * <p>
+ * The PRI_AFTERMODIFY priority represents the notification will be
+ * sent after any internal modification has finished.
+ * <p>
+ * The PRI_BEFOREMODIFY proirity represents the notification will be
+ * sent before any internal modification happens.
+ * <p>
+ * So an element mark with PRI_BEFOREMODIFY will be handled first,
+ * and one with PRI_AFTERMODIFY will be handled at last.
+ */
+enum ElementMarkPriority
+{
+    MINIMUM = 1,
+    AFTERMODIFY,
+    BEFOREMODIFY
+};
+
+} ; } ; } ; } ; } ; } ;
+
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl
new file mode 100644
index 000000000000..ce1d90b17cfa
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl
@@ -0,0 +1,49 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_xml_crypto_sax_elementmarktype_idl_
+#define __com_sun_star_xml_crypto_sax_elementmarktype_idl_
+
+module com { module sun { module star { module xml { module crypto { module sax {
+
+/**
+ * Defines types of element mark.
+ * <p>
+ * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
+ * type represents a element collector.
+ */
+enum ElementMarkType
+{
+    ELEMENTMARK = 1,
+    ELEMENTCOLLECTOR
+};
+
+
+} ; } ; } ; } ; } ; } ;
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl b/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl
new file mode 100644
index 000000000000..afb1b2daaca3
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl
@@ -0,0 +1,60 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_xml_crypto_sax_xelementstackitem_idl_
+#define __com_sun_star_xml_crypto_sax_xelementstackitem_idl_
+
+#include <com/sun/star/xml/sax/XDocumentHandler.idl>
+
+module com { module sun { module star { module xml { module crypto { module sax {
+
+/**
+ * A struct to keep a startElement/endElement SAX event.
+ */
+struct ElementStackItem
+{
+    /**
+     * whether it is a startElement event
+     */
+    boolean isStartElementEvent;
+
+    /**
+     * the name of the element
+     */
+    string elementName;
+
+    /**
+     * attribute list for a startElement event
+     */
+    com::sun::star::xml::sax::XAttributeList xAttributes;
+};
+
+} ; } ; } ; } ; } ; } ;
+
+
+#endif
+
diff --git a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
index 54b951a661e4..c497e7bfd15d 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl
@@ -31,31 +31,11 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/sax/XDocumentHandler.idl>
+#include <com/sun/star/xml/crypto/sax/ElementStackItem.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
 /**
- * A struct to keep a startElement/endElement SAX event.
- */
-struct ElementStackItem
-{
-    /**
-     * whether it is a startElement event
-     */
-    boolean isStartElementEvent;
-
-    /**
-     * the name of the element
-     */
-    string elementName;
-
-    /**
-     * attribute list for a startElement event
-     */
-    com::sun::star::xml::sax::XAttributeList xAttributes;
-};
-
-/**
  * Manipulate the "key SAX events" in a SAX event stream.
  *
  * @see   XSecController
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
index a87fc0ddf2f8..5a7fe434c03f 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
@@ -31,53 +31,13 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl>
+#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkType.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
 /**
- * Represents the undefined security id
- */
-constants ConstOfSecurityId
-{
-    const long UNDEFINEDSECURITYID = -1;
-};
-
-/**
- * Defines priority for the element mark's notification.
- * <p>
- * The PRI_MINIMUM priority is a value less than any practical
- * priority value, it is used when compare between different
- * priority values.
- * <p>
- * The PRI_AFTERMODIFY priority represents the notification will be
- * sent after any internal modification has finished.
- * <p>
- * The PRI_BEFOREMODIFY proirity represents the notification will be
- * sent before any internal modification happens.
- * <p>
- * So an element mark with PRI_BEFOREMODIFY will be handled first,
- * and one with PRI_AFTERMODIFY will be handled at last.
- */
-enum ElementMarkPriority
-{
-    MINIMUM = 1,
-    AFTERMODIFY,
-    BEFOREMODIFY
-};
-
-/**
- * Defines types of element mark.
- * <p>
- * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
- * type represents a element collector.
- */
-enum ElementMarkType
-{
-    ELEMENTMARK = 1,
-    ELEMENTCOLLECTOR
-};
-
-/**
  * Interface of Security SAX Event Keeper.
  * <p>
  * This interface is an extension of the XSAXEventKeeper interface,
diff --git a/offapi/com/sun/star/xml/crypto/sax/makefile.mk b/offapi/com/sun/star/xml/crypto/sax/makefile.mk
deleted file mode 100644
index 094b034340f9..000000000000
--- a/offapi/com/sun/star/xml/crypto/sax/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-#i20156 - new file for xmlsecurity module
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=xsec-sax
-PACKAGE=com$/sun$/star$/xml$/crypto$/sax
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XSecurityController.idl       \
-    XElementStackKeeper.idl       \
-    XSAXEventKeeper.idl        \
-    XSecuritySAXEventKeeper.idl        \
-    XSAXEventKeeperStatusChangeBroadcaster.idl        \
-    XSAXEventKeeperStatusChangeListener.idl        \
-    XKeyCollector.idl        \
-    XReferenceCollector.idl        \
-    XBlockerMonitor.idl        \
-    XMissionTaker.idl        \
-    XEncryptionResultBroadcaster.idl        \
-    XEncryptionResultListener.idl        \
-    XDecryptionResultBroadcaster.idl        \
-    XDecryptionResultListener.idl        \
-    XSignatureCreationResultBroadcaster.idl        \
-    XSignatureCreationResultListener.idl        \
-    XSignatureVerifyResultBroadcaster.idl        \
-    XSignatureVerifyResultListener.idl        \
-    XReferenceResolvedBroadcaster.idl        \
-    XReferenceResolvedListener.idl        \
-    SignatureCreator.idl        \
-    SignatureVerifier.idl        \
-    Decryptor.idl        \
-    Encryptor.idl        \
-    SAXEventKeeper.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
index 14d471272a45..c85d421df76c 100644
--- a/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
+++ b/offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
@@ -28,27 +28,12 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/xml/sax/SAXException.idl>
+#include <com/sun/star/xml/csax/XMLAttribute.idl>
 
 
 module com { module sun { module star { module xml { module csax {
 
 /**
- * A struct to keep information of an element's attribute.
- */
-struct XMLAttribute
-{
-    /**
-     * the attribute name
-     */
-    string sName;
-
-    /**
-     * the attribute value
-     */
-    string sValue;
-};
-
-/**
  * A compressed XDocumentHandler interface.
  * <p>
  * All methods in this interface have the same function with methods
diff --git a/offapi/com/sun/star/xml/csax/XMLAttribute.idl b/offapi/com/sun/star/xml/csax/XMLAttribute.idl
new file mode 100644
index 000000000000..144da6a06db4
--- /dev/null
+++ b/offapi/com/sun/star/xml/csax/XMLAttribute.idl
@@ -0,0 +1,49 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+//i20156 - new file for xmlsecurity module
+
+#ifndef __com_sun_star_xml_csax_XMLAttribute_idl__
+#define __com_sun_star_xml_csax_XMLAttribute_idl__
+
+module com { module sun { module star { module xml { module csax {
+
+/**
+ * A struct to keep information of an element's attribute.
+ */
+struct XMLAttribute
+{
+    /**
+     * the attribute name
+     */
+    string sName;
+
+    /**
+     * the attribute value
+     */
+    string sValue;
+};
+
+} ; } ; } ; } ; } ;
+
+#endif
diff --git a/offapi/com/sun/star/xml/csax/makefile.mk b/offapi/com/sun/star/xml/csax/makefile.mk
deleted file mode 100644
index f1a20591e9df..000000000000
--- a/offapi/com/sun/star/xml/csax/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-#i20156 - new file for xmlsecurity module
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=xsec-csax
-PACKAGE=com$/sun$/star$/xml$/csax
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XCompressedDocumentHandler.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/dom/events/makefile.mk b/offapi/com/sun/star/xml/dom/events/makefile.mk
deleted file mode 100644
index 7d30123cd471..000000000000
--- a/offapi/com/sun/star/xml/dom/events/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdomevents
-PACKAGE=com$/sun$/star$/xml$/dom$/events
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AttrChangeType.idl \
-    EventException.idl \
-    EventType.idl \
-    PhaseType.idl \
-    XDocumentEvent.idl \
-    XEvent.idl \
-    XEventListener.idl \
-    XEventTarget.idl \
-    XMouseEvent.idl \
-    XMutationEvent.idl \
-    XUIEvent.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-
-
-
-
diff --git a/offapi/com/sun/star/xml/dom/makefile.mk b/offapi/com/sun/star/xml/dom/makefile.mk
deleted file mode 100644
index 706d67eaf2b2..000000000000
--- a/offapi/com/sun/star/xml/dom/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdom
-PACKAGE=com$/sun$/star$/xml$/dom
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    DOMException.idl \
-    DOMExceptionType.idl \
-    NodeType.idl \
-    XNode.idl \
-    XAttr.idl \
-    XCharacterData.idl \
-    XText.idl \
-    XCDATASection.idl \
-    XComment.idl \
-    XDOMImplementation.idl \
-    XDocument.idl \
-    XDocumentBuilder.idl \
-    XDocumentFragment.idl \
-    XDocumentType.idl \
-    XElement.idl \
-    XEntity.idl \
-    XEntityReference.idl \
-    XNamedNodeMap.idl \
-    XNodeList.idl \
-    XNotation.idl \
-    XProcessingInstruction.idl \
-    SAXDocumentBuilder.idl \
-    XSAXDocumentBuilder.idl \
-    SAXDocumentBuilderState.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-
-
-
-
diff --git a/offapi/com/sun/star/xml/dom/views/makefile.mk b/offapi/com/sun/star/xml/dom/views/makefile.mk
deleted file mode 100644
index 13353df95dc3..000000000000
--- a/offapi/com/sun/star/xml/dom/views/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssdomviews
-PACKAGE=com$/sun$/star$/xml$/dom$/views
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XAbstractView.idl \
-    XDocumentView.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-
-
-
-
diff --git a/offapi/com/sun/star/xml/input/makefile.mk b/offapi/com/sun/star/xml/input/makefile.mk
deleted file mode 100644
index 53f2ea3e5009..000000000000
--- a/offapi/com/sun/star/xml/input/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ = ..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET = cssxmlinput
-PACKAGE = com$/sun$/star$/xml$/input
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------
-
-IDLFILES = \
-        XRoot.idl                               \
-        XElement.idl                            \
-        XAttributes.idl                         \
-        XNamespaceMapping.idl                   \
-        SaxDocumentHandler.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/makefile.mk b/offapi/com/sun/star/xml/makefile.mk
deleted file mode 100644
index eb138dfdeb0f..000000000000
--- a/offapi/com/sun/star/xml/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssxml
-PACKAGE=com$/sun$/star$/xml
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    AttributeContainer.idl \
-    AttributeData.idl \
-    Attribute.idl \
-    ExportFilter.idl \
-    FastAttribute.idl \
-    ImportFilter.idl \
-    NamespaceContainer.idl \
-    ParaUserDefinedAttributesSupplier.idl \
-    TextUserDefinedAttributesSupplier.idl \
-    UserDefinedAttributesSupplier.idl \
-    UserDefinedAttributeSupplier.idl \
-    XExportFilter.idl \
-    XImportFilter.idl \
-    XMLExportFilter.idl \
-    XMLImportFilter.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/sax/makefile.mk b/offapi/com/sun/star/xml/sax/makefile.mk
deleted file mode 100644
index bc378b1e569a..000000000000
--- a/offapi/com/sun/star/xml/sax/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=csssax
-PACKAGE=com$/sun$/star$/xml$/sax
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    InputSource.idl\
-    SAXException.idl\
-    SAXInvalidCharacterException.idl\
-    SAXParseException.idl\
-    XAttributeList.idl\
-    XDocumentHandler.idl\
-    XDTDHandler.idl\
-    XEntityResolver.idl\
-    XErrorHandler.idl\
-    XExtendedDocumentHandler.idl\
-    XLocator.idl\
-    XParser.idl\
-    XSAXSerializable.idl\
-    XFastParser.idl\
-    XFastDocumentHandler.idl\
-    XFastContextHandler.idl\
-    XFastSAXSerializable.idl\
-    XFastSerializer.idl\
-    XFastShapeContextHandler.idl\
-    XFastTokenHandler.idl\
-    XFastAttributeList.idl\
-    FastToken.idl \
-    FastShapeContextHandler.idl \
-    FastTokenHandler.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/wrapper/makefile.mk b/offapi/com/sun/star/xml/wrapper/makefile.mk
deleted file mode 100644
index 133df7340ef1..000000000000
--- a/offapi/com/sun/star/xml/wrapper/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-#i20156 - new file for xmlsecurity module
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=xsec-wrapper
-PACKAGE=com$/sun$/star$/xml$/wrapper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XMLElementWrapper.idl          \
-    XMLDocumentWrapper.idl          \
-    XXMLElementWrapper.idl          \
-    XXMLDocumentWrapper.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/offapi/com/sun/star/xml/xpath/makefile.mk b/offapi/com/sun/star/xml/xpath/makefile.mk
deleted file mode 100644
index 3ff28dd09dc9..000000000000
--- a/offapi/com/sun/star/xml/xpath/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssxpath
-PACKAGE=com$/sun$/star$/xml$/xpath
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    XPathException.idl \
-    XPathObjectType.idl \
-    XXPathObject.idl \
-    XXPathAPI.idl \
-    XXPathExtension.idl \
-    Libxml2ExtensionHandle.idl \
-    XPathExtension.idl \
-    XPathAPI.idl \
-    Libxml2ExtensionHandle.idl
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-
-
-
-
diff --git a/offapi/com/sun/star/xsd/makefile.mk b/offapi/com/sun/star/xsd/makefile.mk
deleted file mode 100644
index 53aca1d209e1..000000000000
--- a/offapi/com/sun/star/xsd/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=offapi
-
-TARGET=cssxsd
-PACKAGE=com$/sun$/star$/xsd
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------------
-
-IDLFILES=\
-    WhiteSpaceTreatment.idl\
-    Boolean.idl\
-    DataTypeClass.idl\
-    Date.idl\
-    DateTime.idl\
-    Day.idl\
-    Decimal.idl\
-    Month.idl\
-    String.idl\
-    Time.idl\
-    XDataType.idl\
-    Year.idl\
-
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk