@@ -616,28 +616,19 @@ extern DL_IMPORT(PyObject) _Py_NotImplementedStruct; /* Don't use this directly
 #define Py_GE 5
 
 /*
-A common programming style in Python requires the forward declaration
-of static, initialized structures, e.g. for a type object that is used
-by the functions whose address must be used in the initializer.
-Some compilers (notably SCO ODT 3.0, I seem to remember early AIX as
-well) botch this if you use the static keyword for both declarations
-(they allocate two objects, and use the first, uninitialized one until
-the second declaration is encountered).  Therefore, the forward
-declaration should use the 'forwardstatic' keyword.  This expands to
-static on most systems, but to extern on a few.  The actual storage
-and name will still be static because the second declaration is
-static, so no linker visible symbols will be generated.  (Standard C
-compilers take offense to the extern forward declaration of a static
-object, so I can't just put extern in all cases. :-( )
+Define staticforward and statichere for source compatibility with old
+C extensions.
+
+The staticforward define was needed to support certain broken C
+compilers (notably SCO ODT 3.0, perhaps early AIX as well) botched the
+static keyword when it was used with a forward declaration of a static
+initialized structure.  Standard C allows the forward declaration with
+static, and we've decided to stop catering to broken C compilers.
+(In fact, we expect that the compilers are all fixed eight years later.)
 */
 
-#ifdef BAD_STATIC_FORWARD
-#define staticforward extern
-#define statichere static
-#else /* !BAD_STATIC_FORWARD */
 #define staticforward static
 #define statichere static
-#endif /* !BAD_STATIC_FORWARD */
 
 
 /*
 
@@ -23,7 +23,7 @@ typedef struct {
 	PyObject	*x_attr;	/* Attributes dictionary */
 } XxoObject;
 
-staticforward PyTypeObject Xxo_Type;
+static PyTypeObject Xxo_Type;
 
 #define XxoObject_Check(v)	((v)->ob_type == &Xxo_Type)
 
 
@@ -233,7 +233,7 @@ typedef struct {
 	NavReplyRecord itself;
 } navrrobject;
 
-staticforward PyTypeObject Navrrtype;
+static PyTypeObject Navrrtype;
 
 
 
 
@@ -471,7 +471,7 @@ typedef struct {
 	char name[MAXNAME+1];
 } cdfobject;
 
-staticforward PyTypeObject Cdftype;
+static PyTypeObject Cdftype;
 
 
 
@@ -485,7 +485,7 @@ typedef struct {
 	char name[MAXNAME+1];
 } cdrobject;
 
-staticforward PyTypeObject Cdrtype;
+static PyTypeObject Cdrtype;
 
 
 
@@ -503,7 +503,7 @@ typedef struct {
 	conventry *argconv[MAXARG];	/* Value converter list */
 } cdcobject;
 
-staticforward PyTypeObject Cdctype;
+static PyTypeObject Cdctype;
 
 
 
 
@@ -80,7 +80,7 @@ typedef struct {
 	int err;			/* Error to pass to the callback */
 } ctbcmobject;
 
-staticforward PyTypeObject ctbcmtype;
+static PyTypeObject ctbcmtype;
 
 #define is_ctbcmobject(v)		((v)->ob_type == &ctbcmtype)
 
 
@@ -35,7 +35,7 @@ extern int _CtlObj_Convert(PyObject *, ControlHandle *);
 #define CtlObj_Convert _CtlObj_Convert
 #endif
 
-staticforward PyObject *CtlObj_WhichControl(ControlHandle);
+static PyObject *CtlObj_WhichControl(ControlHandle);
 
 #define as_Control(h) ((ControlHandle)h)
 #define as_Resource(ctl) ((Handle)ctl)
@@ -139,9 +139,9 @@ static ControlUserPaneIdleUPP myidleproc_upp;
 static ControlUserPaneHitTestUPP myhittestproc_upp;
 static ControlUserPaneTrackingUPP mytrackingproc_upp;
 
-staticforward int settrackfunc(PyObject *); 	/* forward */
-staticforward void clrtrackfunc(void);	/* forward */
-staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
+static int settrackfunc(PyObject *); 	/* forward */
+static void clrtrackfunc(void);	/* forward */
+static int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
 
 static PyObject *Ctl_Error;
 
 
@@ -43,7 +43,7 @@ typedef struct {
 	short		forkref;
 } forkRefObject;
 
-staticforward PyTypeObject forkRefObject_Type;
+static PyTypeObject forkRefObject_Type;
 
 #define forkRefObject_Check(v)	((v)->ob_type == &forkRefObject_Type)
 
@@ -359,7 +359,7 @@ typedef struct {
 	FSIterator	iterator;
 } iteratorObject;
 
-staticforward PyTypeObject iteratorObject_Type;
+static PyTypeObject iteratorObject_Type;
 
 #define iteratorObject_Check(v)	((v)->ob_type == &iteratorObject_Type)
 
@@ -534,7 +534,7 @@ typedef struct {
 	Boolean		directory;
 } fsRefObject;
 
-staticforward PyTypeObject fsRefObject_Type;
+static PyTypeObject fsRefObject_Type;
 
 #define fsRefObject_Check(v)	((v)->ob_type == &fsRefObject_Type)
 
 
@@ -61,7 +61,7 @@ typedef struct {
 	ICInstance inst;
 } iciobject;
 
-staticforward PyTypeObject Icitype;
+static PyTypeObject Icitype;
 
 
 
 
@@ -70,7 +70,7 @@ typedef struct {
 	AliasHandle alias;
 } mfsaobject;
 
-staticforward PyTypeObject Mfsatype;
+static PyTypeObject Mfsatype;
 
 #define is_mfsaobject(v)		((v)->ob_type == &Mfsatype)
 
@@ -82,7 +82,7 @@ typedef struct {
 	FSSpec fsspec;
 } mfssobject;
 
-staticforward PyTypeObject Mfsstype;
+static PyTypeObject Mfsstype;
 
 #define is_mfssobject(v)		((v)->ob_type == &Mfsstype)
 
@@ -94,7 +94,7 @@ typedef struct {
 	FSRef fsref;
 } mfsrobject;
 
-staticforward PyTypeObject Mfsrtype;
+static PyTypeObject Mfsrtype;
 
 #define is_mfsrobject(v)		((v)->ob_type == &Mfsrtype)
 
@@ -107,13 +107,13 @@ typedef struct {
 	FInfo finfo;
 } mfsiobject;
 
-staticforward PyTypeObject Mfsitype;
+static PyTypeObject Mfsitype;
 
 #define is_mfsiobject(v)		((v)->ob_type == &Mfsitype)
 
 
-staticforward mfssobject *newmfssobject(FSSpec *fss); /* Forward */
-staticforward mfsrobject *newmfsrobject(FSRef *fsr); /* Forward */
+static mfssobject *newmfssobject(FSSpec *fss); /* Forward */
+static mfsrobject *newmfsrobject(FSRef *fsr); /* Forward */
 
 /* ---------------------------------------------------------------- */
 
 
@@ -60,7 +60,7 @@ typedef struct {
 	int isclosed;
 } rfobject;
 
-staticforward PyTypeObject Rftype;
+static PyTypeObject Rftype;