diff --git a/lib/groupaction.php b/lib/groupaction.php
index 5d11e6acdd..39d4804481 100644
--- a/lib/groupaction.php
+++ b/lib/groupaction.php
@@ -27,9 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 define('MEMBERS_PER_SECTION', 27);
 
@@ -290,87 +288,3 @@ class GroupAction extends Action
         return $this->group;
     }
 }
-
-class GroupAdminSection extends ProfileSection
-{
-    var $group;
-
-    function __construct($out, $group)
-    {
-        parent::__construct($out);
-        $this->group = $group;
-    }
-
-    function getProfiles()
-    {
-        return $this->group->getAdmins();
-    }
-
-    function title()
-    {
-        // TRANS: Title for list of group administrators on a group page.
-        return _m('TITLE','Admins');
-    }
-
-    function divId()
-    {
-        return 'group_admins';
-    }
-
-    function moreUrl()
-    {
-        return null;
-    }
-}
-
-class GroupMembersMiniList extends ProfileMiniList
-{
-    function newListItem($profile)
-    {
-        return new GroupMembersMiniListItem($profile, $this->action);
-    }
-}
-
-class GroupMembersMiniListItem extends ProfileMiniListItem
-{
-    function linkAttributes()
-    {
-        $aAttrs = parent::linkAttributes();
-
-        if (common_config('nofollow', 'members')) {
-            $aAttrs['rel'] .= ' nofollow';
-        }
-
-        return $aAttrs;
-    }
-}
-
-class GroupBlockedMiniList extends ProfileMiniList
-{
-    function newListItem($profile)
-    {
-        return new GroupBlockedMiniListItem($profile, $this->action);
-    }
-}
-
-class GroupBlockedMiniListItem extends ProfileMiniListItem
-{
-    function linkAttributes()
-    {
-        $aAttrs = parent::linkAttributes();
-
-        if (common_config('nofollow', 'members')) {
-            $aAttrs['rel'] .= ' nofollow';
-        }
-
-        return $aAttrs;
-    }
-}
-
-class ThreadingGroupNoticeStream extends ThreadingNoticeStream
-{
-    function __construct($group, $profile)
-    {
-        parent::__construct(new GroupNoticeStream($group, $profile));
-    }
-}
diff --git a/lib/groupadminsection.php b/lib/groupadminsection.php
new file mode 100644
index 0000000000..f8aff9cb39
--- /dev/null
+++ b/lib/groupadminsection.php
@@ -0,0 +1,35 @@
+<?php
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class GroupAdminSection extends ProfileSection
+{
+    var $group;
+
+    function __construct($out, $group)
+    {
+        parent::__construct($out);
+        $this->group = $group;
+    }
+
+    function getProfiles()
+    {
+        return $this->group->getAdmins();
+    }
+
+    function title()
+    {
+        // TRANS: Title for list of group administrators on a group page.
+        return _m('TITLE','Admins');
+    }
+
+    function divId()
+    {
+        return 'group_admins';
+    }
+
+    function moreUrl()
+    {
+        return null;
+    }
+}
diff --git a/lib/groupblockedminilist.php b/lib/groupblockedminilist.php
new file mode 100644
index 0000000000..9749ac0843
--- /dev/null
+++ b/lib/groupblockedminilist.php
@@ -0,0 +1,11 @@
+<?php
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class GroupBlockedMiniList extends ProfileMiniList
+{
+    function newListItem(Profile $profile)
+    {
+        return new GroupBlockedMiniListItem($profile, $this->action);
+    }
+}
diff --git a/lib/groupblockedminilistitem.php b/lib/groupblockedminilistitem.php
new file mode 100644
index 0000000000..4d8ccff157
--- /dev/null
+++ b/lib/groupblockedminilistitem.php
@@ -0,0 +1,17 @@
+<?php
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class GroupBlockedMiniListItem extends ProfileMiniListItem
+{
+    function linkAttributes()
+    {
+        $aAttrs = parent::linkAttributes();
+
+        if (common_config('nofollow', 'members')) {
+            $aAttrs['rel'] .= ' nofollow';
+        }
+
+        return $aAttrs;
+    }
+}
diff --git a/lib/groupmembersminilist.php b/lib/groupmembersminilist.php
new file mode 100644
index 0000000000..ed0ccc61f2
--- /dev/null
+++ b/lib/groupmembersminilist.php
@@ -0,0 +1,11 @@
+<?php
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class GroupMembersMiniList extends ProfileMiniList
+{
+    function newListItem(Profile $profile)
+    {
+        return new GroupMembersMiniListItem($profile, $this->action);
+    }
+}
diff --git a/lib/groupmembersminilistitem.php b/lib/groupmembersminilistitem.php
new file mode 100644
index 0000000000..6741e00be7
--- /dev/null
+++ b/lib/groupmembersminilistitem.php
@@ -0,0 +1,17 @@
+<?php
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class GroupMembersMiniListItem extends ProfileMiniListItem
+{
+    function linkAttributes()
+    {
+        $aAttrs = parent::linkAttributes();
+
+        if (common_config('nofollow', 'members')) {
+            $aAttrs['rel'] .= ' nofollow';
+        }
+
+        return $aAttrs;
+    }
+}
diff --git a/lib/threadinggroupnoticestream.php b/lib/threadinggroupnoticestream.php
new file mode 100644
index 0000000000..b026ee4714
--- /dev/null
+++ b/lib/threadinggroupnoticestream.php
@@ -0,0 +1,11 @@
+<?php
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class ThreadingGroupNoticeStream extends ThreadingNoticeStream
+{
+    function __construct($group, $profile)
+    {
+        parent::__construct(new GroupNoticeStream($group, $profile));
+    }
+}