SDK's include/stl is long gone

...since 16280052 "Trying to remove the stlport
mention from the code"

Change-Id: I8785274bc2fdc9d97200aea245e1e8182249cde6

ure/source/uretest/Makefile

@@ -114,9 +114,8 @@ out.sdk/cppmain.uno.$(SHAREDLIB_EXT): out.sdk/cppmain.$(OBJ_EXT) | out.sdk
 
 out.sdk/cppmain.$(OBJ_EXT): cppmain.cc out.sdk/cpputypes.cppumaker.flag \
             out.sdk/types.cppumaker.flag | out.sdk
-	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ -I$(PRJ)/include/stl \
-            $(CC_INCLUDES) -Iout.sdk/include/cpputypes -Iout.sdk/include/types \
-            $(CC_DEFINES) $<
+	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ $(CC_INCLUDES) \
+            -Iout.sdk/include/cpputypes -Iout.sdk/include/types $(CC_DEFINES) $<
 
 
 out.sdk/cpptest.uno.$(SHAREDLIB_EXT): out.sdk/cpptest.$(OBJ_EXT) | out.sdk
@@ -125,9 +124,8 @@ out.sdk/cpptest.uno.$(SHAREDLIB_EXT): out.sdk/cpptest.$(OBJ_EXT) | out.sdk
 
 out.sdk/cpptest.$(OBJ_EXT): cpptest.cc out.sdk/cpputypes.cppumaker.flag \
             out.sdk/types.cppumaker.flag | out.sdk
-	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ -I$(PRJ)/include/stl \
-            $(CC_INCLUDES) -Iout.sdk/include/cpputypes -Iout.sdk/include/types \
-            $(CC_DEFINES) $<
+	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ $(CC_INCLUDES) \
+            -Iout.sdk/include/cpputypes -Iout.sdk/include/types $(CC_DEFINES) $<
 
 
 out.sdk/cppserver.uno.$(SHAREDLIB_EXT): out.sdk/cppserver.$(OBJ_EXT) | out.sdk
@@ -136,9 +134,8 @@ out.sdk/cppserver.uno.$(SHAREDLIB_EXT): out.sdk/cppserver.$(OBJ_EXT) | out.sdk
 
 out.sdk/cppserver.$(OBJ_EXT): cppserver.cc out.sdk/cpputypes.cppumaker.flag \
             out.sdk/types.cppumaker.flag | out.sdk
-	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ -I$(PRJ)/include/stl \
-            $(CC_INCLUDES) -Iout.sdk/include/cpputypes -Iout.sdk/include/types \
-            $(CC_DEFINES) $<
+	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ $(CC_INCLUDES) \
+            -Iout.sdk/include/cpputypes -Iout.sdk/include/types $(CC_DEFINES) $<
 
 
 out.sdk/cpputypes.cppumaker.flag: | out.sdk

ure/source/uretest/Makefile.pln

@@ -86,9 +86,8 @@ out.pln/cppmain.uno.so: out.pln/cppmain.o | out.pln out.pln/lib/libuno_cppu.so \
 out.pln/cppmain.o: cppmain.cc out.pln/cpputypes.cppumaker.flag \
             out.pln/types.cppumaker.flag | out.pln
 	g++ -c -o $@ -fpic -fvisibility=hidden -Wall -Wno-ctor-dtor-privacy \
-            -I $(SDK_HOME)/include/stl -I $(SDK_HOME)/include \
-            -I out.pln/include/cpputypes -I out.pln/include/types \
-            -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
+            -I $(SDK_HOME)/include -I out.pln/include/cpputypes \
+            -I out.pln/include/types -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
 
 
 out.pln/cpptest.uno.so: out.pln/cpptest.o | out.pln out.pln/lib/libuno_cppu.so \
@@ -99,9 +98,8 @@ out.pln/cpptest.uno.so: out.pln/cpptest.o | out.pln out.pln/lib/libuno_cppu.so \
 out.pln/cpptest.o: cpptest.cc out.pln/cpputypes.cppumaker.flag \
             out.pln/types.cppumaker.flag | out.pln
 	g++ -c -o $@ -fpic -fvisibility=hidden -Wall -Wno-ctor-dtor-privacy \
-            -I $(SDK_HOME)/include/stl -I $(SDK_HOME)/include \
-            -I out.pln/include/cpputypes -I out.pln/include/types \
-            -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
+            -I $(SDK_HOME)/include -I out.pln/include/cpputypes \
+            -I out.pln/include/types -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
 
 
 out.pln/cppserver.uno.so: out.pln/cppserver.o | out.pln \
@@ -113,9 +111,8 @@ out.pln/cppserver.uno.so: out.pln/cppserver.o | out.pln \
 out.pln/cppserver.o: cppserver.cc out.pln/cpputypes.cppumaker.flag \
             out.pln/types.cppumaker.flag | out.pln
 	g++ -c -o $@ -fpic -fvisibility=hidden -Wall -Wno-ctor-dtor-privacy \
-            -I $(SDK_HOME)/include/stl -I $(SDK_HOME)/include \
-            -I out.pln/include/cpputypes -I out.pln/include/types \
-            -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
+            -I $(SDK_HOME)/include -I out.pln/include/cpputypes \
+            -I out.pln/include/types -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
 
 
 out.pln/cpputypes.cppumaker.flag: | out.pln