diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/Messages.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/Messages.java
index 9f0862b450e..7460087d20b 100644
--- a/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/Messages.java
+++ b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/Messages.java
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
  * @author weber
  *
  */
-public class Messages extends NLS {
+class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.cdt.jsoncdb.core.ui.internal.messages"; //$NON-NLS-1$
 	public static String JsonCdbPreferencePage_description;
 	public static String JsonCdbPreferencePage_errmsg_suffix_regex;
diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF
index dde9a9c38aa..a0e5dd27870 100644
--- a/jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF
+++ b/jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF
@@ -10,10 +10,7 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.cdt.jsoncdb.core.internal.Plugin
-Export-Package: org.eclipse.cdt.jsoncdb.core;x-friends:="org.eclipse.cdt.jsoncdb.core.ui";
-  uses:="org.eclipse.core.runtime,
-   org.eclipse.cdt.core.settings.model,
-   org.eclipse.cdt.jsoncdb.core.builtins",
+Export-Package: org.eclipse.cdt.jsoncdb.core;uses:="org.eclipse.core.runtime,org.eclipse.cdt.core.settings.model,org.eclipse.cdt.jsoncdb.core.builtins",
  org.eclipse.cdt.jsoncdb.core.participant;uses:="org.eclipse.core.runtime,org.eclipse.cdt.jsoncdb.core.participant.builtins",
  org.eclipse.cdt.jsoncdb.core.participant.builtins;uses:="org.eclipse.cdt.jsoncdb.core.participant"
 Require-Bundle: org.eclipse.ui.workbench;bundle-version="3.8.0",
diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/Messages.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/Messages.java
index 9b48b96c46d..790e06c5e4a 100644
--- a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/Messages.java
+++ b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/Messages.java
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
  * @author weber
  *
  */
-/* package */ public class Messages extends NLS {
+/* package */ class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.cdt.jsoncdb.core.messages"; //$NON-NLS-1$
 	public static String CompileCommandsJsonParser_errmsg_empty_json;
 	public static String CompileCommandsJsonParser_errmsg_file_not_found;
diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Messages.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Messages.java
index 3fd1f487493..bb49ea8d29f 100644
--- a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Messages.java
+++ b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Messages.java
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
  * @author weber
  *
  */
-public class Messages extends NLS {
+class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.cdt.jsoncdb.core.internal.messages"; //$NON-NLS-1$
 	public static String ParserPreferencesAccess_e_get_preferences;
 	public static String ParserPreferencesMetadata_label_console;
diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/Messages.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/Messages.java
index df360000a20..70770488a18 100644
--- a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/Messages.java
+++ b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/Messages.java
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
  * @author weber
  *
  */
-public class Messages extends NLS {
+class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.cdt.jsoncdb.core.internal.builtins.messages"; //$NON-NLS-1$
 	public static String CompilerBuiltinsDetector_errmsg_command_failed;
 	public static String CompilerBuiltinsDetector_msg_detection_finished;