diff --git a/src/claim.c b/src/claim.c
index f2b7d22..e42fc00 100644
--- a/src/claim.c
+++ b/src/claim.c
@@ -95,7 +95,7 @@ indact ()
  * Roledef based.
  *@returns MATCH_NONE or MATCH_CONTENT
  */
-__inline__ int
+int
 events_match_rd (const Roledef rdi, const Roledef rdj)
 {
   if (isTermEqual (rdi->message, rdj->message) &&
@@ -117,7 +117,7 @@ events_match_rd (const Roledef rdi, const Roledef rdj)
 /**
  *@returns any of the MATCH_ signals
  */
-__inline__ int
+int
 events_match (const System sys, const int i, const int j)
 {
   Roledef rdi, rdj;
@@ -150,7 +150,7 @@ events_match (const System sys, const int i, const int j)
 
 
 //! Check nisynch from label_to_index.
-__inline__ int
+int
 oki_nisynch_full (const System sys, const Termmap label_to_index)
 {
   // Are all labels well linked?
@@ -177,7 +177,7 @@ oki_nisynch_full (const System sys, const Termmap label_to_index)
 }
 
 //! Evaluate claims or internal recvs (chooses)
-__inline__ int
+int
 oki_nisynch_other (const System sys, const int trace_index,
 		   const Termmap role_to_run, const Termmap label_to_index)
 {
@@ -198,7 +198,7 @@ oki_nisynch_other (const System sys, const int trace_index,
 }
 
 //! Evaluate recvs
-__inline__ int
+int
 oki_nisynch_recv (const System sys, const int trace_index,
 		  const Termmap role_to_run, const Termmap label_to_index)
 {
@@ -261,7 +261,7 @@ oki_nisynch_recv (const System sys, const int trace_index,
 
 
 //! Evaluate sends
-__inline__ int
+int
 oki_nisynch_send (const System sys, const int trace_index,
 		  const Termmap role_to_run, const Termmap label_to_index)
 {
diff --git a/src/mgu.c b/src/mgu.c
index a1b61e7..6dacb40 100644
--- a/src/mgu.c
+++ b/src/mgu.c
@@ -93,7 +93,7 @@ preferSubstitutionOrder (Term ta, Term tb)
 }
 
 //! See if a substitution is valid
-__inline__ int
+int
 goodsubst (Term tvar, Term tsubst)
 {
   Term tbuf;
diff --git a/src/states.c b/src/states.c
index 30f0b5c..6e06999 100644
--- a/src/states.c
+++ b/src/states.c
@@ -25,7 +25,7 @@
  * Note that these are also used for encountered claims and such.
  */
 
-__inline__ states_t
+states_t
 statesIncrease (const states_t states)
 {
   return states + 1;
@@ -35,7 +35,7 @@ statesIncrease (const states_t states)
 /**
  * Acts like a modified form of %g
  */
-__inline__ void
+void
 statesFormat (const states_t states)
 {
   eprintf ("%lu", states);
diff --git a/src/states.h b/src/states.h
index ef9c378..974f7f3 100644
--- a/src/states.h
+++ b/src/states.h
@@ -31,7 +31,7 @@
 typedef unsigned long int states_t;
 #define STATES0 0
 
-__inline__ states_t statesIncrease (const states_t states);
-__inline__ void statesFormat (const states_t states);
+states_t statesIncrease (const states_t states);
+void statesFormat (const states_t states);
 
 #endif
diff --git a/src/term.c b/src/term.c
index 1138bec..f39da5f 100644
--- a/src/term.c
+++ b/src/term.c
@@ -193,7 +193,7 @@ makeTermType (const int type, const Symbol symb, const int runid)
  *@return A term that is either not a variable, or has a NULL substitution.
  *\sa deVar()
  */
-__inline__ Term
+Term
 deVarScan (Term t)
 {
   while (realTermVariable (t) && t->subst != NULL)
diff --git a/src/term.h b/src/term.h
index ca62308..4f17ca7 100644
--- a/src/term.h
+++ b/src/term.h
@@ -103,7 +103,7 @@ Term makeTermEncrypt (Term t1, Term t2);
 Term makeTermFcall (Term t1, Term t2);
 Term makeTermTuple (Term t1, Term t2);
 Term makeTermType (const int type, const Symbol symb, const int runid);
-__inline__ Term deVarScan (Term t);
+Term deVarScan (Term t);
 #define realTermLeaf(t)		(t != NULL && t->type <= LEAF)
 #define realTermTuple(t)	(t != NULL && t->type == TUPLE)
 #define realTermEncrypt(t)	(t != NULL && t->type == ENCRYPT)
diff --git a/src/termlist.c b/src/termlist.c
index 57900a5..36db8ee 100644
--- a/src/termlist.c
+++ b/src/termlist.c
@@ -159,7 +159,7 @@ termlistDestroy (Termlist tl)
  *
  *@return True iff the term is an element of the termlist.
  */
-__inline__ int
+int
 inTermlist (Termlist tl, const Term term)
 {
   if (term == NULL)
@@ -178,7 +178,7 @@ inTermlist (Termlist tl, const Term term)
 }
 
 //! Determine whether a term is an element of a termlist: yield pointer
-__inline__ Termlist
+Termlist
 termlistFind (Termlist tl, const Term term)
 {
 #ifdef DEBUG
diff --git a/src/termlist.h b/src/termlist.h
index 39f7e72..ab4335b 100644
--- a/src/termlist.h
+++ b/src/termlist.h
@@ -47,8 +47,8 @@ Termlist termlistShallow (Termlist tl);
 void termlistDelete (Termlist tl);
 void termlistDestroy (Termlist tl);
 void termlistPrint (Termlist tl);
-__inline__ int inTermlist (Termlist tl, const Term term);
-__inline__ Termlist termlistFind (Termlist tl, const Term term);
+int inTermlist (Termlist tl, const Term term);
+Termlist termlistFind (Termlist tl, const Term term);
 int isTermlistEqual (Termlist tl1, Termlist tl2);
 Termlist termlistAdd (Termlist tl, Term term);
 #define termlistPrepend(tl,t) termlistAdd(tl,t)