Get rid of #include "../foo/bar.hxx" type includes

Change-Id: I18e2094c1d28b6e0d860e474e33bbf8642ba78fd
Reviewed-on: https://gerrit.libreoffice.org/32845
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

vcl/inc/scrwnd.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_SOURCE_WINDOW_SCRWND_HXX
-#define INCLUDED_VCL_SOURCE_WINDOW_SCRWND_HXX
+#ifndef INCLUDED_VCL_INC_SCRWND_HXX
+#define INCLUDED_VCL_INC_SCRWND_HXX
 
 #include <vcl/floatwin.hxx>
 #include <vcl/bitmap.hxx>
@@ -80,6 +80,6 @@ public:
     void                ImplSetWheelMode( WheelMode nWheelMode );
 };
 
-#endif // INCLUDED_VCL_SOURCE_WINDOW_SCRWND_HXX
+#endif // INCLUDED_VCL_INC_SCRWND_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/source/app/svdata.cxx

@@ -46,7 +46,7 @@
 #include "salsys.hxx"
 #include "svids.hrc"
 #include "helpwin.hxx"
-#include "../window/scrwnd.hxx"
+#include "scrwnd.hxx"
 
 #include "com/sun/star/accessibility/MSAAService.hpp"