diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java
index b852a3047ca..b8e2c06cc22 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java
@@ -288,7 +288,7 @@ public class GdbLaunchDelegate extends AbstractCLaunchDelegate2
 	/**
 	 * Returns true if the specified version of GDB supports
 	 * non-stop mode.
-	 * @since 3.1
+	 * @since 4.0
 	 */
 	protected boolean isNonStopSupportedInGdbVersion(String version) {
 		if (version.contains(LaunchUtils.MACOS_GDB_MARKER)) {
@@ -305,7 +305,7 @@ public class GdbLaunchDelegate extends AbstractCLaunchDelegate2
 	/**
 	 * Returns true if the specified version of GDB supports
 	 * post-mortem tracing.
-	 * @since 3.1
+	 * @since 4.0
 	 */
 	protected boolean isPostMortemTracingSupportedInGdbVersion(String version) {
 		if (version.contains(LaunchUtils.MACOS_GDB_MARKER)) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java
index cfe74405802..735b9919348 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java
@@ -379,7 +379,7 @@ public class GDBControl extends AbstractMIControl implements IGDBControl {
      * instead of the -exec-run method.
      * This can be overridden to allow for customization.
      * 
-     * @since 3.1
+     * @since 4.0
      */
     protected boolean useContinueCommand(ILaunch launch, boolean restart) {
     	// When doing remote debugging, we use -exec-continue instead of -exec-run
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java
index 4e35ee5017b..f4e8af804b6 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java
@@ -500,7 +500,7 @@ public class GDBControl_7_0 extends AbstractMIControl implements IGDBControl {
      * instead of the -exec-run method.
      * This can be overridden to allow for customization.
      * 
-     * @since 3.1
+     * @since 4.0
      */
     protected boolean useContinueCommand(ILaunch launch, boolean restart) {
     	// When doing remote debugging, we use -exec-continue instead of -exec-run
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java
index 05d2439f69c..6f55564fad2 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java
@@ -417,7 +417,7 @@ public class MIExpressions extends AbstractDsfService implements IExpressions3,
 		}
 
 		/**
-         * @since 3.1
+         * @since 4.0
          */
 		public boolean hasChildren() {
 		    return numChildrenHint > 0;
@@ -1170,7 +1170,7 @@ public class MIExpressions extends AbstractDsfService implements IExpressions3,
     /* (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.service.IExpressions3#getExpressionDataExtension(org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext, org.eclipse.cdt.dsf.concurrent.DataRequestMonitor)
      */
-    /** @since 3.1 */
+    /** @since 4.0 */
     public void getExpressionDataExtension(IExpressionDMContext dmc, final DataRequestMonitor<IExpressionDMDataExtension> rm) {
         getExpressionData(dmc, new DataRequestMonitor<IExpressionDMData>(getExecutor(), rm) {
             @Override