diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java
index c0b85886ad6..ca86958d737 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java
@@ -1,18 +1,15 @@
-package org.eclipse.cdt.core.model.tests;
-
-
-
-
 /**********************************************************************
- * Copyright (c) 2002,2003 Rational Software Corporation and others.
+ * Copyright (c) 2004 Rational Software Corporation and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Common Public License v0.5
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v05.html
  * 
  * Contributors: 
- * Rational Software - Initial API and implementation
+ * IBM Rational Software - Initial API and implementation
 ***********************************************************************/
+package org.eclipse.cdt.core.model.tests;
+
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.util.List;
@@ -333,12 +330,12 @@ public class StructuralCModelElementsTests extends TestCase {
 		checkLineNumbers((CElement)var3, 75, 75);
 		
 		// MyPackage ---> function pointer: orig_malloc_hook
-/*		IVariable vDecl2 = (IVariable) nsVars.get(3);
+		IVariable vDecl2 = (IVariable) nsVars.get(3);
 		assertEquals(vDecl2.getElementName(), new String("orig_malloc_hook"));
 		checkElementOffset((CElement)vDecl2);
-		assertEquals(vDecl2.getTypeName(), new String ("void*(*)(const char*, int, size_t)"));
+		assertEquals(vDecl2.getTypeName(), new String ("void*(*)(const char*, int, int)"));
 		checkLineNumbers((CElement)vDecl2, 81, 81);
-*/		
+		
 	}
 
 	private void checkVariableDeclarations(IParent namespace) throws CModelException{
diff --git a/core/org.eclipse.cdt.core.tests/resources/cfiles/included.h b/core/org.eclipse.cdt.core.tests/resources/cfiles/included.h
index aad51d7caa3..73773ad41db 100644
--- a/core/org.eclipse.cdt.core.tests/resources/cfiles/included.h
+++ b/core/org.eclipse.cdt.core.tests/resources/cfiles/included.h
@@ -1,3 +1,4 @@
+#define size_t int
 class B {
 int b;
 };
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties
index 2e501e017e6..cb24c8cda65 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties
@@ -22,7 +22,7 @@ ConsolePreferencePage.errorColor.label=Error message text color
 
 CBasePreferencePage.linkToEditor.label=Link view selection to active editor
 CBasePreferencePage.CUChildren.label=Show file members in Project View
-CBasePreferencePage.OutlineView.structuralParseMode.label=Use Structural-Parse mode to build the CModel
+CBasePreferencePage.OutlineView.structuralParseMode.label=Follow #include's when producing the outline view
 
 CBasePreferencePage.editorFont.label=C Editor font: