better #include statements in OSCAR
updated #include statements due to OSCAR update
added support for linking to external OSCAR
cosmetics, consistent binning, removed commented code