diff --git a/runtime/oti/j9nonbuilder.h b/runtime/oti/j9nonbuilder.h
index 37b78b08374..93d0c585ccd 100644
--- a/runtime/oti/j9nonbuilder.h
+++ b/runtime/oti/j9nonbuilder.h
@@ -341,33 +341,19 @@ typedef enum {
 	J9FlushCompQueueDataBreakpoint
 } J9JITFlushCompilationQueueReason;
 
-
 /* Forward struct declarations. */
 struct DgRasInterface;
-struct J9AnnotationInfo;
-struct J9AnnotationInfoEntry;
-struct J9AnnotationState;
 struct J9AOTConfig;
 struct J9BytecodeVerificationData;
 struct J9CfrClassFile;
 struct J9Class;
 struct J9ClassLoader;
-struct J9ClassWalkState;
 struct J9ConstantPool;
 struct J9HashTable;
-struct J9HiddenInstanceField;
 struct J9HookedNative;
-struct J9IdentityHashData;
-struct J9JavaLangManagementData;
 struct J9JavaVM;
-struct J9JavaVMAttachArgs;
-struct J9JImage;
-struct J9JImageIntf;
-struct J9JImageLocation;
-struct J9JITExceptionTable;
 struct J9JVMTIClassPair;
 struct J9JXEDescription;
-struct J9LoadROMClassData;
 struct J9MemorySegment;
 struct J9MemorySegmentList;
 struct J9Method;
@@ -377,37 +363,18 @@ struct J9MM_IterateObjectDescriptor;
 struct J9MM_IterateObjectRefDescriptor;
 struct J9MM_IterateRegionDescriptor;
 struct J9MM_IterateSpaceDescriptor;
-struct J9MonitorEnterRecord;
-struct J9MonitorTableListEntry;
-struct J9NativeLibrary;
-struct J9ObjectMonitor;
 struct J9ObjectMonitorInfo;
 struct J9Pool;
 struct J9PortLibrary;
-struct J9RAS;
 struct J9RASdumpContext;
 struct J9RASdumpFunctions;
 struct J9ROMClass;
-struct J9ROMFieldOffsetWalkState;
-struct J9ROMFieldShape;
-struct J9ROMFullTraversalFieldOffsetWalkState;
 struct J9ROMMethod;
-struct J9SharedCacheAPI;
-struct J9SharedClassConfig;
-struct J9SharedClassPreinitConfig;
 struct J9SharedInternSRPHashTableEntry;
-struct J9SharedInvariantInternTable;
-struct J9StackWalkState;
 struct J9Statistic;
-struct J9TranslationBufferSet;
-struct J9UnsafeMemoryBlock;
 struct J9UTF8;
 struct J9VerboseSettings;
-struct J9VerboseStruct;
-struct J9VMDllLoadInfo;
-struct J9VMInitArgs;
 struct J9VMInterface;
-struct J9VMSystemProperty;
 struct J9VMThread;
 struct JNINativeInterface_;
 struct OMR_VM;