diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index df3308534..74d5f290c 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -334,8 +334,6 @@ extern	_X_EXPORT int	DeviceEnterNotify,DeviceLeaveNotify;
 #define	False	FALSE
 #endif
 
-_XFUNCPROTOBEGIN
-
 extern _X_EXPORT void XkbUseMsg(
     void
 );
@@ -1000,8 +998,6 @@ extern _X_EXPORT XkbDescPtr XkbCompileKeymap(
         XkbRMLVOSet *   /* rmlvo */
 );
 
-_XFUNCPROTOEND
-
 #define	XkbAtomGetString(s)	NameForAtom(s)
 
 #endif /* _XKBSRV_H_ */
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index 173affee9..fe4da3806 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -311,8 +311,6 @@ typedef struct _XkbGeometrySizes {
 	unsigned short	num_key_aliases;
 } XkbGeometrySizesRec,*XkbGeometrySizesPtr;
 
-_XFUNCPROTOBEGIN
-
 extern	XkbPropertyPtr
 XkbAddGeomProperty(
     XkbGeometryPtr	/* geom */,
@@ -630,6 +628,4 @@ XkbFindOverlayForKey(
 	char *			/* under */
 );
 
-_XFUNCPROTOEND
-
 #endif /* _XKBGEOM_H_ */