Post-merge fixes

Author: Meinersbur

flang/include/flang/Semantics/semantics.h

@@ -11,7 +11,6 @@
 
 #include "scope.h"
 #include "symbol.h"
-#include "flang/Common/Fortran-features.h"
 #include "flang/Common/LangOptions.h"
 #include "flang/Evaluate/common.h"
 #include "flang/Evaluate/intrinsics.h"

flang/include/flang/Tools/CrossToolHelpers.h

@@ -14,9 +14,7 @@
 #define FORTRAN_TOOLS_CROSS_TOOL_HELPERS_H
 
 #include "flang/Common/LangOptions.h"
-#include "flang/Common/MathOptionsBase.h"
 #include "flang/Frontend/CodeGenOptions.h"
-#include "flang/Frontend/LangOptions.h"
 #include "flang/Support/MathOptionsBase.h"
 #include <cstdint>
 

flang/tools/bbc/bbc.cpp

@@ -14,11 +14,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "flang/Common/Fortran-features.h"
 #include "flang/Common/LangOptions.h"
-#include "flang/Common/OpenMP-features.h"
-#include "flang/Common/Version.h"
-#include "flang/Common/default-kinds.h"
 #include "flang/Frontend/TargetOptions.h"
 #include "flang/Lower/Bridge.h"
 #include "flang/Lower/PFTBuilder.h"