Order sources in CMakeLists.txt files.

25 files changed, 146 insertions, 146 deletions

diff --git a/storage/src/tests/bucketdb/CMakeLists.txt b/storage/src/tests/bucketdb/CMakeLists.txt
index 566338d4917..5aa4e18cb84 100644
--- a/storage/src/tests/bucketdb/CMakeLists.txt
+++ b/storage/src/tests/bucketdb/CMakeLists.txt
@@ -1,13 +1,13 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_testbucketdb TEST
     SOURCES
-    initializertest.cpp
+    bucketinfotest.cpp
     bucketmanagertest.cpp
+    distribution_hash_normalizer_test.cpp
+    initializertest.cpp
     judyarraytest.cpp
     judymultimaptest.cpp
     lockablemaptest.cpp
-    bucketinfotest.cpp
-    distribution_hash_normalizer_test.cpp
     DEPENDS
     storage
     storage_testcommon
diff --git a/storage/src/tests/common/CMakeLists.txt b/storage/src/tests/common/CMakeLists.txt
index c7243e68146..8dd4e969d04 100644
--- a/storage/src/tests/common/CMakeLists.txt
+++ b/storage/src/tests/common/CMakeLists.txt
@@ -2,9 +2,9 @@
 vespa_add_library(storage_testcommon TEST
     SOURCES
     dummystoragelink.cpp
-    testhelper.cpp
     metricstest.cpp
     storagelinktest.cpp
+    testhelper.cpp
     testnodestateupdater.cpp
     teststorageapp.cpp
     DEPENDS
diff --git a/storage/src/tests/common/hostreporter/CMakeLists.txt b/storage/src/tests/common/hostreporter/CMakeLists.txt
index 6d72c3d7053..11a4c0f3f0b 100644
--- a/storage/src/tests/common/hostreporter/CMakeLists.txt
+++ b/storage/src/tests/common/hostreporter/CMakeLists.txt
@@ -2,12 +2,12 @@
 vespa_add_library(storage_testhostreporter TEST
     SOURCES
     cpureportertest.cpp
+    diskreportertest.cpp
+    hostinfotest.cpp
     memreportertest.cpp
     networkreportertest.cpp
-    versionreportertest.cpp
-    diskreportertest.cpp
     util.cpp
-    hostinfotest.cpp
+    versionreportertest.cpp
     DEPENDS
     storage
 )
diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt
index 4e0a73b6465..f58fd37f622 100644
--- a/storage/src/tests/distributor/CMakeLists.txt
+++ b/storage/src/tests/distributor/CMakeLists.txt
@@ -1,46 +1,46 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_testdistributor TEST
     SOURCES
-    mergelimitertest.cpp
+    blockingoperationstartertest.cpp
     bucketdatabasetest.cpp
-    messagesenderstub.cpp
+    bucketdbmetricupdatertest.cpp
+    bucketdbupdatertest.cpp
+    bucketgctimecalculatortest.cpp
+    bucketstateoperationtest.cpp
+    distributor_host_info_reporter_test.cpp
+    distributortest.cpp
+    distributortestutil.cpp
     externaloperationhandlertest.cpp
+    garbagecollectiontest.cpp
     getoperationtest.cpp
     idealstatemanagertest.cpp
+    joinbuckettest.cpp
+    maintenanceschedulertest.cpp
+    mapbucketdatabasetest.cpp
+    mergelimitertest.cpp
+    mergeoperationtest.cpp
+    messagesenderstub.cpp
+    nodeinfotest.cpp
+    nodemaintenancestatstrackertest.cpp
+    operation_sequencer_test.cpp
+    operationtargetresolvertest.cpp
+    ownership_transfer_safe_time_point_calculator_test.cpp
+    pendingmessagetrackertest.cpp
+    persistence_metrics_set_test.cpp
     putoperationtest.cpp
-    removeoperationtest.cpp
     removebucketoperationtest.cpp
-    mergeoperationtest.cpp
-    splitbuckettest.cpp
-    joinbuckettest.cpp
-    visitoroperationtest.cpp
-    twophaseupdateoperationtest.cpp
     removelocationtest.cpp
-    bucketdbupdatertest.cpp
-    statoperationtest.cpp
-    pendingmessagetrackertest.cpp
-    distributortestutil.cpp
+    removeoperationtest.cpp
     simplebucketprioritydatabasetest.cpp
     simplemaintenancescannertest.cpp
-    maintenanceschedulertest.cpp
-    throttlingoperationstartertest.cpp
-    blockingoperationstartertest.cpp
-    nodeinfotest.cpp
-    updateoperationtest.cpp
-    bucketstateoperationtest.cpp
-    distributortest.cpp
-    mapbucketdatabasetest.cpp
-    operationtargetresolvertest.cpp
-    garbagecollectiontest.cpp
+    splitbuckettest.cpp
     statecheckerstest.cpp
+    statoperationtest.cpp
     statusreporterdelegatetest.cpp
-    bucketdbmetricupdatertest.cpp
-    bucketgctimecalculatortest.cpp
-    nodemaintenancestatstrackertest.cpp
-    distributor_host_info_reporter_test.cpp
-    ownership_transfer_safe_time_point_calculator_test.cpp
-    persistence_metrics_set_test.cpp
-    operation_sequencer_test.cpp
+    throttlingoperationstartertest.cpp
+    twophaseupdateoperationtest.cpp
+    updateoperationtest.cpp
+    visitoroperationtest.cpp
     DEPENDS
     storage_distributor
     storage_testcommon
diff --git a/storage/src/tests/persistence/CMakeLists.txt b/storage/src/tests/persistence/CMakeLists.txt
index f5715ca3531..07b71dbae8a 100644
--- a/storage/src/tests/persistence/CMakeLists.txt
+++ b/storage/src/tests/persistence/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_testpersistence TEST
     SOURCES
-    processalltest.cpp
-    persistencetestutils.cpp
-    splitbitdetectortest.cpp
-    legacyoperationhandlertest.cpp
+    bucketownershipnotifiertest.cpp
     diskmoveoperationhandlertest.cpp
-    provider_error_wrapper_test.cpp
+    legacyoperationhandlertest.cpp
     mergehandlertest.cpp
-    persistencethread_splittest.cpp
-    bucketownershipnotifiertest.cpp
     persistencequeuetest.cpp
+    persistencetestutils.cpp
+    persistencethread_splittest.cpp
+    processalltest.cpp
+    provider_error_wrapper_test.cpp
+    splitbitdetectortest.cpp
     testandsettest.cpp
     DEPENDS
     storage
diff --git a/storage/src/tests/persistence/common/CMakeLists.txt b/storage/src/tests/persistence/common/CMakeLists.txt
index 816a2a05ac2..7910336c141 100644
--- a/storage/src/tests/persistence/common/CMakeLists.txt
+++ b/storage/src/tests/persistence/common/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_testpersistence_common TEST
     SOURCES
-    persistenceproviderwrapper.cpp
     filestortestfixture.cpp
+    persistenceproviderwrapper.cpp
     DEPENDS
     persistence
     storage_testcommon
diff --git a/storage/src/tests/persistence/filestorage/CMakeLists.txt b/storage/src/tests/persistence/filestorage/CMakeLists.txt
index 9c57b2a6a6b..dfd5902b236 100644
--- a/storage/src/tests/persistence/filestorage/CMakeLists.txt
+++ b/storage/src/tests/persistence/filestorage/CMakeLists.txt
@@ -1,14 +1,14 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_testfilestorage TEST
     SOURCES
+    deactivatebucketstest.cpp
+    deletebuckettest.cpp
     filestormanagertest.cpp
-    operationabortingtest.cpp
+    filestormodifiedbucketstest.cpp
     mergeblockingtest.cpp
-    sanitycheckeddeletetest.cpp
-    deactivatebucketstest.cpp
     modifiedbucketcheckertest.cpp
-    filestormodifiedbucketstest.cpp
-    deletebuckettest.cpp
+    operationabortingtest.cpp
+    sanitycheckeddeletetest.cpp
     singlebucketjointest.cpp
     DEPENDS
     storage
diff --git a/storage/src/tests/storageserver/CMakeLists.txt b/storage/src/tests/storageserver/CMakeLists.txt
index 959261dc8ff..38fb0f6235a 100644
--- a/storage/src/tests/storageserver/CMakeLists.txt
+++ b/storage/src/tests/storageserver/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_teststorageserver TEST
     SOURCES
+    bouncertest.cpp
+    bucketintegritycheckertest.cpp
+    changedbucketownershiphandlertest.cpp
     communicationmanagertest.cpp
-    statemanagertest.cpp
     documentapiconvertertest.cpp
     mergethrottlertest.cpp
-    testvisitormessagesession.cpp
-    bouncertest.cpp
-    bucketintegritycheckertest.cpp
     priorityconvertertest.cpp
-    statereportertest.cpp
-    changedbucketownershiphandlertest.cpp
     service_layer_error_listener_test.cpp
+    statemanagertest.cpp
+    statereportertest.cpp
+    testvisitormessagesession.cpp
     DEPENDS
     storage_storageserver
     storage_testcommon
diff --git a/storage/src/tests/storageutil/CMakeLists.txt b/storage/src/tests/storageutil/CMakeLists.txt
index db3e14f3f31..68d2517bda3 100644
--- a/storage/src/tests/storageutil/CMakeLists.txt
+++ b/storage/src/tests/storageutil/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_teststorageutil TEST
     SOURCES
-    functortest.cpp
     charttest.cpp
+    functortest.cpp
     palettetest.cpp
     DEPENDS
     storage
diff --git a/storage/src/tests/visiting/CMakeLists.txt b/storage/src/tests/visiting/CMakeLists.txt
index 4c9cd3370e4..1c048e70468 100644
--- a/storage/src/tests/visiting/CMakeLists.txt
+++ b/storage/src/tests/visiting/CMakeLists.txt
@@ -2,9 +2,9 @@
 vespa_add_library(storage_testvisiting TEST
     SOURCES
     commandqueuetest.cpp
+    memory_bounded_trace_test.cpp
     visitormanagertest.cpp
     visitortest.cpp
-    memory_bounded_trace_test.cpp
     DEPENDS
     storage
     storage_teststorageserver
diff --git a/storage/src/vespa/storage/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
index 6e3a0c2e986..1b59ea2290b 100644
--- a/storage/src/vespa/storage/bucketdb/CMakeLists.txt
+++ b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
@@ -5,13 +5,13 @@ vespa_add_library(storage_bucketdb OBJECT
     bucketdatabase.cpp
     bucketinfo.cpp
     bucketmanager.cpp
+    bucketmanagermetrics.cpp
     distribution_hash_normalizer.cpp
     judyarray.cpp
-    mapbucketdatabase.cpp
     lockablemap.cpp
+    mapbucketdatabase.cpp
     storagebucketdbinitializer.cpp
     storbucketdb.cpp
-    bucketmanagermetrics.cpp
     DEPENDS
     AFTER
     storage_storageconfig
diff --git a/storage/src/vespa/storage/bucketmover/CMakeLists.txt b/storage/src/vespa/storage/bucketmover/CMakeLists.txt
index 05fce5996b7..669c13d3bc1 100644
--- a/storage/src/vespa/storage/bucketmover/CMakeLists.txt
+++ b/storage/src/vespa/storage/bucketmover/CMakeLists.txt
@@ -1,11 +1,11 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_bucketmover OBJECT
     SOURCES
+    bucketmover.cpp
     htmltable.cpp
     move.cpp
-    runstatistics.cpp
     run.cpp
-    bucketmover.cpp
+    runstatistics.cpp
     DEPENDS
     AFTER
     storage_storageconfig
diff --git a/storage/src/vespa/storage/common/CMakeLists.txt b/storage/src/vespa/storage/common/CMakeLists.txt
index aff675b2a65..59e27307c77 100644
--- a/storage/src/vespa/storage/common/CMakeLists.txt
+++ b/storage/src/vespa/storage/common/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_common OBJECT
     SOURCES
-    statusmetricconsumer.cpp
-    storagelink.cpp
-    storagelinkqueued.cpp
+    bucketmessages.cpp
     bucketoperationlogger.cpp
+    distributorcomponent.cpp
     messagebucket.cpp
-    bucketmessages.cpp
-    statusmessages.cpp
     messagesender.cpp
-    storagecomponent.cpp
     servicelayercomponent.cpp
-    distributorcomponent.cpp
+    statusmessages.cpp
+    statusmetricconsumer.cpp
+    storagecomponent.cpp
+    storagelink.cpp
+    storagelinkqueued.cpp
     DEPENDS
     AFTER
     storage_storageconfig
diff --git a/storage/src/vespa/storage/common/hostreporter/CMakeLists.txt b/storage/src/vespa/storage/common/hostreporter/CMakeLists.txt
index 4f2e47d73b0..1cc10b47767 100644
--- a/storage/src/vespa/storage/common/hostreporter/CMakeLists.txt
+++ b/storage/src/vespa/storage/common/hostreporter/CMakeLists.txt
@@ -2,11 +2,11 @@
 vespa_add_library(storage_hostreporter OBJECT
     SOURCES
     cpureporter.cpp
+    diskreporter.cpp
+    hostinfo.cpp
     kernelmetrictool.cpp
     memreporter.cpp
     networkreporter.cpp
-    hostinfo.cpp
-    diskreporter.cpp
     versionreporter.cpp
     DEPENDS
     AFTER
diff --git a/storage/src/vespa/storage/distributor/CMakeLists.txt b/storage/src/vespa/storage/distributor/CMakeLists.txt
index 1712d1729a9..2d40f0d0e33 100644
--- a/storage/src/vespa/storage/distributor/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/CMakeLists.txt
@@ -1,41 +1,41 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_distributor
     SOURCES
+    activecopy.cpp
+    blockingoperationstarter.cpp
+    bucketdbupdater.cpp
+    bucketgctimecalculator.cpp
+    bucketlistmerger.cpp
+    clusterinformation.cpp
     distributor.cpp
-    distributormetricsset.cpp
-    visitormetricsset.cpp
-    persistence_operation_metric_set.cpp
-    idealstatemetricsset.cpp
-    operationowner.cpp
+    distributor_host_info_reporter.cpp
     distributorcomponent.cpp
-    statechecker.cpp
-    persistencemessagetracker.cpp
-    messagetracker.cpp
+    distributormessagesender.cpp
+    distributormetricsset.cpp
     externaloperationhandler.cpp
-    bucketlistmerger.cpp
     idealstatemanager.cpp
-    statecheckers.cpp
-    bucketdbupdater.cpp
-    pendingmessagetracker.cpp
-    pendingclusterstate.cpp
-    nodeinfo.cpp
-    sentmessagemap.cpp
-    operationtargetresolver.cpp
-    operationtargetresolverimpl.cpp
-    throttlingoperationstarter.cpp
-    blockingoperationstarter.cpp
-    distributormessagesender.cpp
-    clusterinformation.cpp
-    activecopy.cpp
-    statusreporterdelegate.cpp
-    bucketgctimecalculator.cpp
-    distributor_host_info_reporter.cpp
+    idealstatemetricsset.cpp
     latency_statistics_provider.cpp
-    ownership_transfer_safe_time_point_calculator.cpp
     managed_bucket_space.cpp
     managed_bucket_space_component.cpp
     managed_bucket_space_repo.cpp
+    messagetracker.cpp
+    nodeinfo.cpp
     operation_sequencer.cpp
+    operationowner.cpp
+    operationtargetresolver.cpp
+    operationtargetresolverimpl.cpp
+    ownership_transfer_safe_time_point_calculator.cpp
+    pendingclusterstate.cpp
+    pendingmessagetracker.cpp
+    persistence_operation_metric_set.cpp
+    persistencemessagetracker.cpp
+    sentmessagemap.cpp
+    statechecker.cpp
+    statecheckers.cpp
+    statusreporterdelegate.cpp
+    throttlingoperationstarter.cpp
+    visitormetricsset.cpp
     $<TARGET_OBJECTS:storage_distributoroperation>
     $<TARGET_OBJECTS:storage_distributoroperationexternal>
     $<TARGET_OBJECTS:storage_distributoroperationidealstate>
diff --git a/storage/src/vespa/storage/distributor/maintenance/CMakeLists.txt b/storage/src/vespa/storage/distributor/maintenance/CMakeLists.txt
index 31cfde01b28..3e72a03b4b9 100644
--- a/storage/src/vespa/storage/distributor/maintenance/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/maintenance/CMakeLists.txt
@@ -1,11 +1,11 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_distributormaintenance OBJECT
     SOURCES
-    simplebucketprioritydatabase.cpp
-    simplemaintenancescanner.cpp
-    prioritizedbucket.cpp
     maintenancescheduler.cpp
     node_maintenance_stats_tracker.cpp
+    prioritizedbucket.cpp
+    simplebucketprioritydatabase.cpp
+    simplemaintenancescanner.cpp
     DEPENDS
     AFTER
     storage_storageconfig
diff --git a/storage/src/vespa/storage/distributor/operations/external/CMakeLists.txt b/storage/src/vespa/storage/distributor/operations/external/CMakeLists.txt
index 8c0576b7db7..f3547f2d879 100644
--- a/storage/src/vespa/storage/distributor/operations/external/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/operations/external/CMakeLists.txt
@@ -1,17 +1,17 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_distributoroperationexternal OBJECT
     SOURCES
+    getoperation.cpp
+    multioperationoperation.cpp
+    multioperationoperation.cpp
     putoperation.cpp
+    removelocationoperation.cpp
     removeoperation.cpp
-    updateoperation.cpp
-    twophaseupdateoperation.cpp
+    statbucketlistoperation.cpp
     statbucketoperation.cpp
-    removelocationoperation.cpp
-    multioperationoperation.cpp
-    getoperation.cpp
-    multioperationoperation.cpp
+    twophaseupdateoperation.cpp
+    updateoperation.cpp
     visitoroperation.cpp
-    statbucketlistoperation.cpp
     DEPENDS
     AFTER
     storage_storageconfig
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt b/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt
index 3dccf658421..255c177161d 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/CMakeLists.txt
@@ -1,15 +1,15 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_distributoroperationidealstate OBJECT
     SOURCES
+    garbagecollectionoperation.cpp
     idealstateoperation.cpp
     joinoperation.cpp
+    mergelimiter.cpp
+    mergemetadata.cpp
     mergeoperation.cpp
-    splitoperation.cpp
     removebucketoperation.cpp
     setbucketstateoperation.cpp
-    garbagecollectionoperation.cpp
-    mergelimiter.cpp
-    mergemetadata.cpp
+    splitoperation.cpp
     DEPENDS
     AFTER
     storage_storageconfig
diff --git a/storage/src/vespa/storage/frameworkimpl/component/CMakeLists.txt b/storage/src/vespa/storage/frameworkimpl/component/CMakeLists.txt
index 3185816ebee..7122bd488fe 100644
--- a/storage/src/vespa/storage/frameworkimpl/component/CMakeLists.txt
+++ b/storage/src/vespa/storage/frameworkimpl/component/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_component OBJECT
     SOURCES
-    storagecomponentregisterimpl.cpp
-    servicelayercomponentregisterimpl.cpp
     distributorcomponentregisterimpl.cpp
+    servicelayercomponentregisterimpl.cpp
+    storagecomponentregisterimpl.cpp
     DEPENDS
     AFTER
     storage_storageconfig
diff --git a/storage/src/vespa/storage/frameworkimpl/thread/CMakeLists.txt b/storage/src/vespa/storage/frameworkimpl/thread/CMakeLists.txt
index 3c03da2103f..603ddf26b90 100644
--- a/storage/src/vespa/storage/frameworkimpl/thread/CMakeLists.txt
+++ b/storage/src/vespa/storage/frameworkimpl/thread/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_thread OBJECT
     SOURCES
-    deadlockdetector.cpp
     appkiller.cpp
+    deadlockdetector.cpp
     DEPENDS
     AFTER
     storage_storageconfig
diff --git a/storage/src/vespa/storage/persistence/CMakeLists.txt b/storage/src/vespa/storage/persistence/CMakeLists.txt
index 1f2299bf46d..9edc3bc0080 100644
--- a/storage/src/vespa/storage/persistence/CMakeLists.txt
+++ b/storage/src/vespa/storage/persistence/CMakeLists.txt
@@ -1,19 +1,19 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_spersistence OBJECT
     SOURCES
-    persistenceutil.cpp
-    splitbitdetector.cpp
-    persistencethread.cpp
-    processallhandler.cpp
+    bucketownershipnotifier.cpp
+    bucketprocessor.cpp
     diskmoveoperationhandler.cpp
-    types.cpp
+    fieldvisitor.cpp
     mergehandler.cpp
-    bucketprocessor.cpp
+    messages.cpp
+    persistencethread.cpp
+    persistenceutil.cpp
+    processallhandler.cpp
     provider_error_wrapper.cpp
-    bucketownershipnotifier.cpp
-    fieldvisitor.cpp
+    splitbitdetector.cpp
     testandsethelper.cpp
-    messages.cpp
+    types.cpp
     DEPENDS
     AFTER
     storage_storageconfig
diff --git a/storage/src/vespa/storage/persistence/filestorage/CMakeLists.txt b/storage/src/vespa/storage/persistence/filestorage/CMakeLists.txt
index 123754c73d1..704ad434386 100644
--- a/storage/src/vespa/storage/persistence/filestorage/CMakeLists.txt
+++ b/storage/src/vespa/storage/persistence/filestorage/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_filestorpersistence OBJECT
     SOURCES
-    filestormetrics.cpp
-    filestormanager.cpp
     filestorhandler.cpp
     filestorhandlerimpl.cpp
+    filestormanager.cpp
+    filestormetrics.cpp
     mergestatus.cpp
     modifiedbucketchecker.cpp
     DEPENDS
diff --git a/storage/src/vespa/storage/storageserver/CMakeLists.txt b/storage/src/vespa/storage/storageserver/CMakeLists.txt
index 2fd3fe43a57..3d0a0fdfa14 100644
--- a/storage/src/vespa/storage/storageserver/CMakeLists.txt
+++ b/storage/src/vespa/storage/storageserver/CMakeLists.txt
@@ -1,29 +1,29 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_storageserver
     SOURCES
-    priorityconverter.cpp
-    bucketintegritychecker.cpp
     bouncer.cpp
-    messagesink.cpp
-    fnetlistener.cpp
-    rpcrequestwrapper.cpp
+    bucketintegritychecker.cpp
+    changedbucketownershiphandler.cpp
     communicationmanager.cpp
     communicationmanagermetrics.cpp
-    statemanager.cpp
+    distributornode.cpp
+    distributornodecontext.cpp
     documentapiconverter.cpp
-    opslogger.cpp
+    fnetlistener.cpp
     mergethrottler.cpp
     messageallocationtypes.cpp
-    storagenodecontext.cpp
-    distributornodecontext.cpp
-    servicelayernodecontext.cpp
-    storagenode.cpp
-    distributornode.cpp
+    messagesink.cpp
+    opslogger.cpp
+    priorityconverter.cpp
+    rpcrequestwrapper.cpp
+    service_layer_error_listener.cpp
     servicelayernode.cpp
+    servicelayernodecontext.cpp
+    statemanager.cpp
     statereporter.cpp
     storagemetricsset.cpp
-    changedbucketownershiphandler.cpp
-    service_layer_error_listener.cpp
+    storagenode.cpp
+    storagenodecontext.cpp
     INSTALL lib64
     DEPENDS
     storage
diff --git a/storage/src/vespa/storage/storageutil/CMakeLists.txt b/storage/src/vespa/storage/storageutil/CMakeLists.txt
index 10c7ce67d4f..6317465ab8e 100644
--- a/storage/src/vespa/storage/storageutil/CMakeLists.txt
+++ b/storage/src/vespa/storage/storageutil/CMakeLists.txt
@@ -2,9 +2,9 @@
 vespa_add_library(storage_storageutil OBJECT
     SOURCES
     bloomfilter.cpp
-    piechart.cpp
-    palette.cpp
     graph.cpp
+    palette.cpp
+    piechart.cpp
     DEPENDS
     AFTER
     storage_storageconfig
diff --git a/storage/src/vespa/storage/visiting/CMakeLists.txt b/storage/src/vespa/storage/visiting/CMakeLists.txt
index 6d93d96114d..9344a2cc983 100644
--- a/storage/src/vespa/storage/visiting/CMakeLists.txt
+++ b/storage/src/vespa/storage/visiting/CMakeLists.txt
@@ -2,16 +2,16 @@
 vespa_add_library(storage_visitor OBJECT
     SOURCES
     ${CMAKE_CURRENT_BINARY_DIR}/config-stor-visitor.h
+    countvisitor.cpp
+    dumpvisitor.cpp
+    dumpvisitorsingle.cpp
+    memory_bounded_trace.cpp
+    recoveryvisitor.cpp
+    testvisitor.cpp
     visitor.cpp
     visitormanager.cpp
     visitormetrics.cpp
     visitorthread.cpp
-    testvisitor.cpp
-    recoveryvisitor.cpp
-    dumpvisitor.cpp
-    countvisitor.cpp
-    dumpvisitorsingle.cpp
-    memory_bounded_trace.cpp
     DEPENDS
     AFTER
     storage_storageconfig