diff --git a/plasma/packagestructure.cpp b/plasma/packagestructure.cpp
index c507afa3..a8e5ad2e 100644
--- a/plasma/packagestructure.cpp
+++ b/plasma/packagestructure.cpp
@@ -66,8 +66,8 @@ class ContentStructure
         QStringList paths;
         QString name;
         QStringList mimetypes;
-        bool directory : 1;
-        bool required : 1;
+        bool directory;
+        bool required;
 };
 
 class PackageStructurePrivate
@@ -75,10 +75,10 @@ class PackageStructurePrivate
 public:
     PackageStructurePrivate(const QString &t)
         : type(t),
-          packageRoot("plasma/plasmoids"),
-          servicePrefix("plasma-applet-"),
-          metadata(0),
-          externalPaths(false)
+        packageRoot("plasma/plasmoids"),
+        servicePrefix("plasma-applet-"),
+        metadata(nullptr),
+        externalPaths(false)
     {
         contentsPrefixPaths << "contents/";
     }
@@ -89,7 +89,7 @@ public:
     }
 
     void createPackageMetadata(const QString &path);
-    QStringList entryList(const QString &prefix, const QString &requestedPath);
+    QStringList entryList(const QString &prefix, const QString &requestedPath) const;
 
     QString type;
     QString path;
@@ -238,7 +238,7 @@ QList<QByteArray> PackageStructure::requiredFiles() const
     return files;
 }
 
-QStringList PackageStructure::entryList(const char *key)
+QStringList PackageStructure::entryList(const char *key) const
 {
     QString p = path(key);
 
@@ -259,7 +259,7 @@ QStringList PackageStructure::entryList(const char *key)
     return list;
 }
 
-QStringList PackageStructurePrivate::entryList(const QString &prefix, const QString &requestedPath)
+QStringList PackageStructurePrivate::entryList(const QString &prefix, const QString &requestedPath) const
 {
     QDir dir(path + prefix + requestedPath);
 
diff --git a/plasma/packagestructure.h b/plasma/packagestructure.h
index d95b8197..dd645dee 100644
--- a/plasma/packagestructure.h
+++ b/plasma/packagestructure.h
@@ -183,7 +183,7 @@ public:
      * @return list of files by name
      * @since 4.3
      */
-    QStringList entryList(const char *key);
+    QStringList entryList(const char *key) const;
 
     /**
      * @return user visible name for the given entry
diff --git a/plasma/popupapplet.h b/plasma/popupapplet.h
index fda9dfb2..450ac4cc 100644
--- a/plasma/popupapplet.h
+++ b/plasma/popupapplet.h
@@ -142,7 +142,6 @@ public:
      */
     bool isIconified() const;
 
-
 public Q_SLOTS:
     /**
      * Hides the popup.
diff --git a/plasma/wallpaper.h b/plasma/wallpaper.h
index a788cb48..18fdf977 100644
--- a/plasma/wallpaper.h
+++ b/plasma/wallpaper.h
@@ -374,7 +374,6 @@ class PLASMA_EXPORT Wallpaper : public QObject
          */
         bool needsPreviewDuringConfiguration() const;
 
-
     Q_SIGNALS:
         /**
          * This signal indicates that wallpaper needs to be repainted.